Merge branch 'release/maint-b' into marchcat/b-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
#	indra/newview/llfilepicker.cpp

1 files changed, 16 insertions, 24 deletions

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index e8b586fdf1..432ac5510c 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1120,19 +1120,17 @@ bool LLDAELoader::OpenFile(const std::string& filename)
 
         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);
+                        }
                     }
                 }
             }
@@ -1302,6 +1300,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)
@@ -1386,6 +1385,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
                     }
                 }//got skeleton?
             }
+        }
 
 
         domSkin::domJoints* joints = skin->getJoints();
@@ -1686,7 +1686,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);
     }
 }
 
@@ -2079,21 +2079,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)
@@ -2164,8 +2157,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);
                 }
             }
         }