Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

3 files changed, 4 insertions, 4 deletions

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index d60d6cdaac..4e3e49ec9f 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -97,7 +97,7 @@ void LLModel::offsetMesh(const LLVector3& pivotPoint)
 
     for (LLVolumeFace& face : mVolumeFaces)
     {
-        for (U32 i = 0; i < face.mNumVertices; ++i)
+        for (S32 i = 0; i < face.mNumVertices; ++i)
         {
             face.mPositions[i].add(pivot);
         }
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index af5bbf2da8..309c5df64c 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -207,7 +207,7 @@ public:
     void trimVolumeFacesToSize(U32 new_count = LL_SCULPT_MESH_MAX_FACES, LLVolume::face_list_t* remainder = NULL);
     void remapVolumeFaces();
     void optimizeVolumeFaces();
-    void offsetMesh(const LLVector3& pivotPoint);
+    void offsetMesh( const LLVector3& pivotPoint );
     void getNormalizedScaleTranslation(LLVector3& scale_out, LLVector3& translation_out) const;
     LLVector3 getTransformedCenter(const LLMatrix4& mat);
 
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h
index 637dabe08a..530e61e2b8 100644
--- a/indra/llprimitive/llmodelloader.h
+++ b/indra/llprimitive/llmodelloader.h
@@ -156,12 +156,12 @@ public:
     bool loadFromSLM(const std::string& filename);
 
     void loadModelCallback();
-    void loadTextures(); // called in the main thread.
+    void loadTextures() ; // called in the main thread.
     void setLoadState(U32 state);
 
     void stretch_extents(const LLModel* model, const LLMatrix4& mat);
 
-    S32 mNumOfFetchingTextures; // updated in the main thread
+    S32 mNumOfFetchingTextures ; // updated in the main thread
     bool areTexturesReady() { return !mNumOfFetchingTextures; } // called in the main thread.
 
     bool verifyCount( int expected, int result );