From c22bc1fd2deac8b28b48eb0afef4cfc25ffcf98b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 20 Mar 2022 16:48:45 -0400
Subject: [PATCH] Trivial opts and cleanup
---
indra/llappearance/lltexglobalcolor.h | 2 +-
indra/llappearance/lltexlayer.h | 4 ++--
indra/llappearance/lltexlayerparams.h | 6 +++---
indra/newview/llagent.h | 2 +-
indra/newview/llvosurfacepatch.cpp | 4 +---
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index c9e99bf688e..718685899af 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 0d5f3520d23..aaa32fd0296 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 cb57d1f26e4..1c593515019 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 e4b53b3cd81..b48acff65f9 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 a2adf2d1079..8ffb24744af 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);
--
GitLab