From e4dd93ed3c0c503f121865917115eef543df5368 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sun, 14 Apr 2024 03:00:41 +0200
Subject: secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00

---
 indra/llprimitive/llmodel.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'indra/llprimitive/llmodel.cpp')

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index d56ffdc317..aea4cf676f 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -90,19 +90,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] );
-	
-	for (std::vector<LLVolumeFace>::iterator faceIt = mVolumeFaces.begin(); faceIt != mVolumeFaces.end(); )
+	LLVector4a pivot(pivotPoint[VX], pivotPoint[VY], pivotPoint[VZ]);
+
+	for (LLVolumeFace& face : mVolumeFaces)
 	{
-		std::vector<LLVolumeFace>:: iterator currentFaceIt = faceIt++;
-		LLVolumeFace& face = *currentFaceIt;
-		LLVector4a *pos = (LLVector4a*) face.mPositions;
-		
-		for (U32 i=0; i<face.mNumVertices; ++i )
+		for (U32 i = 0; i < face.mNumVertices; ++i)
 		{
-			pos[i].add( pivot );
+			face.mPositions[i].add(pivot);
 		}
 	}
 }
@@ -337,7 +333,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;
-- 
cgit v1.2.3