diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8b0f64dc3b0b11492db91025b760751cb7a757cc..8ec2d9d6cb5eeb02bfaf0caa8c2cf581d0b426e6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3549,10 +3549,13 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
     gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
 
-	std::vector<std::string> resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList();
-	for (auto res_iter : resolutions)
+	if (gViewerWindow && gViewerWindow->getWindow())
 	{
-		gDebugInfo["DisplayInfo"].append(res_iter);
+		std::vector<std::string> resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList();
+		for (auto res_iter : resolutions)
+		{
+			gDebugInfo["DisplayInfo"].append(res_iter);
+		}
 	}
 
 	writeDebugInfo(); // Save out debug_info.log early, in case of crash.
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 76657c8dae653f6fd6cee0bd2c5b6a02230352bb..6de30e9a14bad69d64ad5cd2b446c4e164c49c23 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -588,7 +588,7 @@ void LLControlAvatar::updateAnimations()
                 anims[anim_pair.first] = anim_pair.second;
             }
 #ifdef SHOW_DEBUG
-            LL_DEBUGS("AnimatedObjectsNotify") << "found anim for vol " << volp->getID() << " anim " << anim_it->first << " root " << mRootVolp->getID() << LL_ENDL;
+            LL_DEBUGS("AnimatedObjectsNotify") << "found anim for vol " << volp->getID() << " anim " << anim_pair.first << " root " << mRootVolp->getID() << LL_ENDL;
 #endif
         }
     }
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index ffb37752f45afcb0104d853fd57d01ddc96d53ba..e0a518fc9ff1ea1e3bf7fdd33ac3040767d9b45b 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -595,7 +595,7 @@ void LLModelPreview::rebuildUploadData()
                     high_lod_model->mSkinInfo.mBindShapeMatrix.store4a((F32*)bind_mat.mMatrix);
                     LLQuaternion bind_rot = LLSkinningUtil::getUnscaledQuaternion(bind_mat);
                     LLQuaternion identity;
-                    if (!bind_rot.isEqualEps(identity, 0.01))
+                    if (!bind_rot.isEqualEps(identity, 0.01f))
                     {
                         // Bind shape matrix is not in standard X-forward orientation.
                         // Might be good idea to only show this once. It can be spammy.
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c9e0fd7a159f4d84304c63fcfa20b7a50850d1c3..759416a5a1b7f9488677ebe8dfb50bf0b13e1320 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -704,7 +704,6 @@ bool LLToolPie::walkToClickedLocation()
         mPick = saved_pick;
         return false;
     }
-    return true;
 }
 
 bool LLToolPie::teleportToClickedLocation()
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index fdc528e0e24fcd1703c67eef2a207948c67299c8..34661fad61655505ad19b9933b859c9124fdc8a5 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -114,7 +114,7 @@ class LLLocalizedInventoryItemsDictionary final : public LLSingleton<LLLocalized
 	bool localizeInventoryObjectName(std::string& object_name)
 	{
 #ifdef SHOW_DEBUG
-		LL_DEBUGS(LOG_LOCAL) << "Searching for localization: " << object_name << LL_ENDL;
+		LL_DEBUGS("InventoryLocalize") << "Searching for localization: " << object_name << LL_ENDL;
 #endif
 
 		std::map<std::string, std::string>::const_iterator dictionary_iter = mInventoryItemsDict.find(object_name);
@@ -124,7 +124,7 @@ class LLLocalizedInventoryItemsDictionary final : public LLSingleton<LLLocalized
 		{
 			object_name = dictionary_iter->second;
 #ifdef SHOW_DEBUG
-			LL_DEBUGS(LOG_LOCAL) << "Found, new name is: " << object_name << LL_ENDL;
+			LL_DEBUGS("InventoryLocalize") << "Found, new name is: " << object_name << LL_ENDL;
 #endif
 		}
 		return found;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index e114562106af8c9874edbe9a82d5877141496e01..558301ce6877778d534ae9ece25fc22a36fee6a5 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10843,8 +10843,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
 			}
 
 			// print any avatar textures we didn't already know about
-		    for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
-			 iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
+		    for (const auto& tex_pair :LLAvatarAppearance::getDictionary()->getTextures())
 			{
 			    const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
 				// TODO: MULTI-WEARABLE: handle multiple textures for self