Merge branch 'develop' into rlva/base

1 files changed, 6 insertions, 10 deletions

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 9908a155f2..4e3e49ec9f 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -91,19 +91,15 @@ std::string LLModel::getStatusString(U32 status)
 }
 
 
-void LLModel::offsetMesh( const LLVector3& pivotPoint )
+void LLModel::offsetMesh(const LLVector3& pivotPoint)
 {
-    LLVector4a pivot( pivotPoint[VX], pivotPoint[VY], pivotPoint[VZ] );
+    LLVector4a pivot(pivotPoint[VX], pivotPoint[VY], pivotPoint[VZ]);
 
-    for (std::vector<LLVolumeFace>::iterator faceIt = mVolumeFaces.begin(); faceIt != mVolumeFaces.end(); )
+    for (LLVolumeFace& face : mVolumeFaces)
     {
-        std::vector<LLVolumeFace>:: iterator currentFaceIt = faceIt++;
-        LLVolumeFace& face = *currentFaceIt;
-        LLVector4a *pos = (LLVector4a*) face.mPositions;
-
-        for (S32 i=0; i<face.mNumVertices; ++i )
+        for (S32 i = 0; i < face.mNumVertices; ++i)
         {
-            pos[i].add( pivot );
+            face.mPositions[i].add(pivot);
         }
     }
 }
@@ -338,7 +334,7 @@ void LLModel::normalizeVolumeFaces()
     }
 }
 
-void LLModel::getNormalizedScaleTranslation(LLVector3& scale_out, LLVector3& translation_out)
+void LLModel::getNormalizedScaleTranslation(LLVector3& scale_out, LLVector3& translation_out) const
 {
     scale_out = mNormalizedScale;
     translation_out = mNormalizedTranslation;