diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index 317f5c8e04bd4a62bcc6078b6529b94583d5b95d..5f3397845bf96aaeefb0f0eba02263c39c9c5fbe 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -254,12 +254,10 @@ void LLConsole::Paragraph::makeParagraphColorSegments (const LLColor4 &color)
 	LLSD color_sd = color.getValue();
 	paragraph_color_segments[0]["color"]=color_sd;
 
-	for(LLSD::array_const_iterator color_segment_it = paragraph_color_segments.beginArray();
-		color_segment_it != paragraph_color_segments.endArray();
-		++color_segment_it)
+	for(const auto& color_segment_it : paragraph_color_segments.array())
 	{			
-		LLSD color_llsd = (*color_segment_it)["color"];
-		std::string color_str  = (*color_segment_it)["text"].asString();
+		LLSD color_llsd = color_segment_it["color"];
+		std::string color_str  = color_segment_it["text"].asString();
 
 		ParagraphColorSegment color_segment;
 		
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index e8da24d78a9f5c9c761ae989dea2c54159d7f4c0..184148d6185fb9a5fd25d555a6516ccea2ce311a 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -202,7 +202,7 @@ class LLMeshHeader
 {
 public:
 
-    LLMeshHeader() {}
+	LLMeshHeader() = default;
 
     explicit LLMeshHeader(const LLSD& header)
     {
@@ -211,7 +211,7 @@ class LLMeshHeader
 
     void fromLLSD(const LLSD& header)
     {
-        const char* lod[] =
+        static const char* lod[] =
         {
             "lowest_lod",
             "low_lod",
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 0282d2d171329fdc8ad911d28de48e9b298299bd..725ac76c5a104561c982e1407467704bb073b198 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -385,13 +385,12 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
             continue;
         }
 
-        LLSD::map_const_iterator iter;
-        for (iter = result.beginMap(); iter != result.endMap(); ++iter)
+        for (const auto& iter : result.map())
         {
-            regionp->setCapability(iter->first, iter->second);
+            regionp->setCapability(iter.first, iter.second);
 
             LL_DEBUGS("AppInit", "Capabilities")
-                << "Capability '" << iter->first << "' is '" << iter->second << "'" << LL_ENDL;
+                << "Capability '" << iter.first << "' is '" << iter.second << "'" << LL_ENDL;
         }
 
 #if 0