Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' into 2025.04

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index d8e05e1d01..c73282dad3 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -2498,6 +2498,8 @@ void LLModelPreview::updateStatusMessages()
     S32 phys_tris = 0;
     S32 phys_hulls = 0;
     S32 phys_points = 0;
+    S32 which_mode = 0;
+    S32 file_mode = 1;
 
     //get the triangle count for the whole scene
     for (LLModelLoader::scene::iterator iter = mScene[LLModel::LOD_PHYSICS].begin(), endIter = mScene[LLModel::LOD_PHYSICS].end(); iter != endIter; ++iter)
@@ -2619,18 +2621,16 @@ void LLModelPreview::updateStatusMessages()
             fmp->childEnable("simplify_cancel");
             fmp->childEnable("decompose_cancel");
         }
-    }
 
-
-    LLCtrlSelectionInterface* iface = fmp->childGetSelectionInterface("physics_lod_combo");
-    S32 which_mode = 0;
-    S32 file_mode = 1;
-    if (iface)
-    {
-        which_mode = iface->getFirstSelectedIndex();
-        file_mode = iface->getItemCount() - 1;
+        LLCtrlSelectionInterface* iface = fmp->childGetSelectionInterface("physics_lod_combo");
+        if (iface)
+        {
+            which_mode = iface->getFirstSelectedIndex();
+            file_mode = iface->getItemCount() - 1;
+        }
     }
 
+
     if (which_mode == file_mode)
     {
         mFMP->childEnable("physics_file");