Merge remote-tracking branch 'release/maint-b' into nat/maint-b-tests

1 files changed, 13 insertions, 20 deletions

diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index fc826727e1..e35aa0572f 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -37,7 +37,7 @@
 
 std::list<LLModelLoader*> LLModelLoader::sActiveLoaderList;
 
-void stretch_extents(LLModel* model, LLMatrix4a& mat, LLVector4a& min, LLVector4a& max, BOOL& first_transform)
+static void stretch_extents(const LLModel* model, const LLMatrix4a& mat, LLVector4a& min, LLVector4a& max, bool& first_transform)
 {
 	LLVector4a box[] =
 	{
@@ -59,7 +59,7 @@ void stretch_extents(LLModel* model, LLMatrix4a& mat, LLVector4a& min, LLVector4
 		center.setAdd(face.mExtents[0], face.mExtents[1]);
 		center.mul(0.5f);
 		LLVector4a size;
-		size.setSub(face.mExtents[1],face.mExtents[0]);
+		size.setSub(face.mExtents[1], face.mExtents[0]);
 		size.mul(0.5f);
 
 		for (U32 i = 0; i < 8; i++)
@@ -74,7 +74,7 @@ void stretch_extents(LLModel* model, LLMatrix4a& mat, LLVector4a& min, LLVector4
 
 			if (first_transform)
 			{
-				first_transform = FALSE;
+				first_transform = false;
 				min = max = v;
 			}
 			else
@@ -85,19 +85,19 @@ void stretch_extents(LLModel* model, LLMatrix4a& mat, LLVector4a& min, LLVector4
 	}
 }
 
-void stretch_extents(LLModel* model, LLMatrix4& mat, LLVector3& min, LLVector3& max, BOOL& first_transform)
+void LLModelLoader::stretch_extents(const LLModel* model, const LLMatrix4& mat)
 {
 	LLVector4a mina, maxa;
 	LLMatrix4a mata;
 
 	mata.loadu(mat);
-	mina.load3(min.mV);
-	maxa.load3(max.mV);
+	mina.load3(mExtents[0].mV);
+	maxa.load3(mExtents[1].mV);
 
-	stretch_extents(model, mata, mina, maxa, first_transform);
+	::stretch_extents(model, mata, mina, maxa, mFirstTransform);
 
-	min.set(mina.getF32ptr());
-	max.set(maxa.getF32ptr());
+	mExtents[0].set(mina.getF32ptr());
+	mExtents[1].set(maxa.getF32ptr());
 }
 
 //-----------------------------------------------------------------------------
@@ -121,7 +121,7 @@ LLModelLoader::LLModelLoader(
 , mFilename(filename)
 , mLod(lod)
 , mTrySLM(false)
-, mFirstTransform(TRUE)
+, mFirstTransform(true)
 , mNumOfFetchingTextures(0)
 , mLoadCallback(load_cb)
 , mJointLookupFunc(joint_lookup_func)
@@ -292,14 +292,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
 			{
 				if (idx >= model[lod].size())
 				{
-					if (model[lod].size())
-					{
-						instance_list[i].mLOD[lod] = model[lod][0];
-					}
-					else
-					{
-						instance_list[i].mLOD[lod] = NULL;
-					}					
+					instance_list[i].mLOD[lod] = model[lod].front();
 					continue;
 				}
 
@@ -337,12 +330,12 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
 
 
 	//convert instance_list to mScene
-	mFirstTransform = TRUE;
+	mFirstTransform = true;
 	for (U32 i = 0; i < instance_list.size(); ++i)
 	{
 		LLModelInstance& cur_instance = instance_list[i];
 		mScene[cur_instance.mTransform].push_back(cur_instance);
-		stretch_extents(cur_instance.mModel, cur_instance.mTransform, mExtents[0], mExtents[1], mFirstTransform);
+		stretch_extents(cur_instance.mModel, cur_instance.mTransform);
 	}
 	
 	setLoadState( DONE );