1 files changed, 18 insertions, 26 deletions

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 2e4b013b77..97d48f6873 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -65,7 +65,7 @@
 #include <boost/regex.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
-std::string colladaVersion[VERSIONTYPE_COUNT+1] = 
+std::string colladaVersion[VERSIONTYPE_COUNT+1] =
 {
 	"1.4.0",
 	"1.4.1",
@@ -1119,22 +1119,20 @@ bool LLDAELoader::OpenFile(const std::string& filename)
 	{ //add skinned meshes as instances
 		domSkin* skin = NULL;
 		db->getElement((daeElement**) &skin, idx, NULL, COLLADA_TYPE_SKIN);
-		
+
 		if (skin)
 		{
-			domGeometry* geom = daeSafeCast<domGeometry>(skin->getSource().getElement());
-			
-			if (geom)
+			if (domGeometry* geom = daeSafeCast<domGeometry>(skin->getSource().getElement()))
 			{
-				domMesh* mesh = geom->getMesh();
-				if (mesh)
+				if (domMesh* mesh = geom->getMesh())
 				{
-					std::vector< LLPointer< LLModel > >::iterator i = mModelsMap[mesh].begin();
-					while (i != mModelsMap[mesh].end())
+					dae_model_map::const_iterator it = mModelsMap.find(mesh);
+					if (it != mModelsMap.end())
 					{
-						LLPointer<LLModel> mdl = *i;
-						LLDAELoader::processDomModel(mdl, &dae, root, mesh, skin);
-						i++;
+						for (const LLPointer<LLModel>& model : it->second)
+						{
+							LLDAELoader::processDomModel(model, &dae, root, mesh, skin);
+						}
 					}
 				}
 			}
@@ -1304,6 +1302,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 			}
 		}
 		else
+		{
 			//Has one or more skeletons
             for (std::vector<domInstance_controller::domSkeleton*>::iterator skel_it = skeletons.begin();
                  skel_it != skeletons.end(); ++skel_it)
@@ -1388,6 +1387,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
                     }
                 }//got skeleton?
             }
+        }
 
 
 		domSkin::domJoints* joints = skin->getJoints();
@@ -1688,7 +1688,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 			materials[model->mMaterialList[i]] = LLImportMaterial();
 		}
 		mScene[transformation].push_back(LLModelInstance(model, model->mLabel, transformation, materials));
-		stretch_extents(model, transformation, mExtents[0], mExtents[1], mFirstTransform);
+		stretch_extents(model, transformation);
 	}
 }
 
@@ -2081,21 +2081,14 @@ void LLDAELoader::processElement( daeElement* element, bool& badElement, DAE* da
 		mTransform.condition();
 	}
 
-	domInstance_geometry* instance_geo = daeSafeCast<domInstance_geometry>(element);
-	if (instance_geo)
+	if (domInstance_geometry* instance_geo = daeSafeCast<domInstance_geometry>(element))
 	{
-		domGeometry* geo = daeSafeCast<domGeometry>(instance_geo->getUrl().getElement());
-		if (geo)
+		if (domGeometry* geo = daeSafeCast<domGeometry>(instance_geo->getUrl().getElement()))
 		{
-			domMesh* mesh = daeSafeCast<domMesh>(geo->getDescendant(daeElement::matchType(domMesh::ID())));
-			if (mesh)
+			if (domMesh* mesh = daeSafeCast<domMesh>(geo->getDescendant(daeElement::matchType(domMesh::ID()))))
 			{
-
-				std::vector< LLPointer< LLModel > >::iterator i = mModelsMap[mesh].begin();				
-				while (i != mModelsMap[mesh].end())
+				for (LLModel* model : mModelsMap.find(mesh)->second)
 				{
-					LLModel* model = *i;
-
 					LLMatrix4 transformation = mTransform;
 				
 					if (mTransform.determinant() < 0)
@@ -2166,8 +2159,7 @@ void LLDAELoader::processElement( daeElement* element, bool& badElement, DAE* da
 					}
 
 					mScene[transformation].push_back(LLModelInstance(model, label, transformation, materials));
-					stretch_extents(model, transformation, mExtents[0], mExtents[1], mFirstTransform);
-					i++;
+					stretch_extents(model, transformation);
 				}
 			}
 		}