diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index c9e99bf688e8b825c6d2cf47cfd0125a18b570b7..718685899af5c114faddac2102fd5af5d4cd4aeb 100644
--- a/indra/llappearance/lltexglobalcolor.h
+++ b/indra/llappearance/lltexglobalcolor.h
@@ -71,7 +71,7 @@ class LLTexGlobalColorInfo
 	std::string				mName;
 };
 
-class LLTexParamGlobalColor : public LLTexLayerParamColor
+class LLTexParamGlobalColor final : public LLTexLayerParamColor
 {
 public:
 	LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index 0d5f3520d23997703ce7000900c92ecc097ea1db..aaa32fd0296885384d91cb33a7caafdce7bce805 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -115,7 +115,7 @@ class LLTexLayerInterface
 //
 // Only exists for llvoavatarself.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLTexLayerTemplate : public LLTexLayerInterface
+class LLTexLayerTemplate final : public LLTexLayerInterface
 {
 public:
 	LLTexLayerTemplate(LLTexLayerSet* const layer_set, LLAvatarAppearance* const appearance);
@@ -143,7 +143,7 @@ class LLTexLayerTemplate : public LLTexLayerInterface
 //
 // A single texture layer.  Only exists for llvoavatarself.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLTexLayer : public LLTexLayerInterface
+class LLTexLayer final : public LLTexLayerInterface
 {
 public:
 	LLTexLayer(LLTexLayerSet* const layer_set);
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
index cb57d1f26e4ec30d3c1905b3a159cf098d72aa57..1c593515019adb031b0ffabf2e6445d5d2eea490 100644
--- a/indra/llappearance/lltexlayerparams.h
+++ b/indra/llappearance/lltexlayerparams.h
@@ -63,7 +63,7 @@ class LLTexLayerParam : public LLViewerVisualParam
 // 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 LL_ALIGN_PREFIX(16)
-class LLTexLayerParamAlpha : public LLTexLayerParam
+class LLTexLayerParamAlpha final : public LLTexLayerParam
 {
 public:
 	LLTexLayerParamAlpha( LLTexLayerInterface* layer );
@@ -122,7 +122,7 @@ class LLTexLayerParamAlpha : public LLTexLayerParam
 	typedef std::list< LLTexLayerParamAlpha* > param_alpha_ptr_list_t;
 	static param_alpha_ptr_list_t sInstances;
 } LL_ALIGN_POSTFIX(16);
-class LLTexLayerParamAlphaInfo : public LLViewerVisualParamInfo
+class LLTexLayerParamAlphaInfo final : public LLViewerVisualParamInfo
 {
 	friend class LLTexLayerParamAlpha;
 public:
@@ -201,7 +201,7 @@ class LLTexLayerParamColor : public LLTexLayerParam
 	LL_ALIGN_16(LLVector4a				mAvgDistortionVec);
 } LL_ALIGN_POSTFIX(16);
 
-class LLTexLayerParamColorInfo : public LLViewerVisualParamInfo
+class LLTexLayerParamColorInfo final : public LLViewerVisualParamInfo
 {
 	friend class LLTexLayerParamColor;
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index e4b53b3cd815933749e369dc0df41ed202323d5a..b48acff65f9c0cb7102b1b0ac576c527dc681a26 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -89,7 +89,7 @@ class LLAgentListener;
 //------------------------------------------------------------------------
 // LLAgent
 //------------------------------------------------------------------------
-class LLAgent : public LLOldEvents::LLObservable
+class LLAgent final : public LLOldEvents::LLObservable
 {
 	LOG_CLASS(LLAgent);
 
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index a2adf2d1079b7b523bab1ef3245c3f8032cbc744..8ffb24744af243ee4f31d5ad425ee5764806982d 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -1019,10 +1019,8 @@ void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
 	U32 indices_index = 0;
 	U32 index_offset = 0;
 
-	for (std::vector<LLFace*>::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i)
+	for (LLFace* facep : mFaceList)
 	{
-		LLFace* facep = *i;
-
 		facep->setIndicesIndex(indices_index);
 		facep->setGeomIndex(index_offset);
 		facep->setVertexBuffer(buffer);