Merge tag 'Second_Life_Release#f5d350fb-2025.05-gltf-mesh-import' into 2025.05

3 files changed, 47 insertions, 34 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 4141191038..a86b9c7da2 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1426,7 +1426,7 @@
          word_wrap="true">
         </text_editor>
         <check_box
-         control_name="ImporterDebug"
+         control_name="ImporterDebugVerboseLogging"
          follows="top|left"
          top_pad="9"
          left="6"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 84252fe32c..f2309eb817 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -54,38 +54,19 @@
                   label="jitter"
                   decimal_digits="1"
                   stat="frametimejitter"/>
-          <stat_bar name="framet_cumulative"
-                    label="jitter cumulative"
-                    decimal_digits="1"
-                    stat="frametimejitcumulative"/>
-          <stat_bar name="framet_jitter_99th"
-                    label="jitter 99th percentile"
-                    decimal_digits="1"
-                    stat="frametimejitter99"/>
-          <stat_bar name="framet_jitter_95th"
-                    label="jitter 95th percentile"
-                    decimal_digits="1"
-                    stat="frametimejitter95"/>
-          <stat_bar name="framet_jitter_stddev"
-                    label="frametime jitter standard deviation"
-                    decimal_digits="1"
-                    stat="frametimejitterstddev"/>
-          <stat_bar name="framet_99th"
-                    label="frametime 99th percentile"
-                    decimal_digits="1"
-                    stat="frametime99"/>
-          <stat_bar name="framet_95th"
-                    label="frametime 95th percentile"
-                    decimal_digits="1"
-                    stat="frametime95"/>
-          <stat_bar name="framet_stddev"
-                    label="frametime standard deviation"
-                    decimal_digits="1"
-                    stat="frametimestddev"/>
-          <stat_bar name="framet_events"
-                    label="frametime events"
-                    decimal_digits="1"
-                    stat="frametimeevents"/>
+          <stat_bar name="normalized_cumulative_frametime"
+                    label="normalized sess. jitter"
+                    decimal_digits="4"
+                    stat="normalizedframetimejitter"/>
+          <stat_bar name="frame_events_per_minute"
+                    label="frame events/minute"
+                    decimal_digits="2"
+                    stat="frametimeeventspm"/>
+          <stat_bar name="frame_events_last_minute"
+                    label="frame events last min."
+                    decimal_digits="0"
+                    stat="frametimeeventslastmin"/>
+          
         <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
@@ -106,6 +87,38 @@
         <stat_view name="render"
                    label="Render"
                    setting="OpenDebugStatRender">
+            <stat_bar name="framet_cumulative"
+                    label="jitter cumulative"
+                    decimal_digits="1"
+                    stat="frametimejitcumulative"/>
+            <stat_bar name="framet_jitter_99th"
+                      label="jitter 99th percentile"
+                      decimal_digits="1"
+                      stat="frametimejitter99"/>
+            <stat_bar name="framet_jitter_95th"
+                      label="jitter 95th percentile"
+                      decimal_digits="1"
+                      stat="frametimejitter95"/>
+            <stat_bar name="framet_jitter_stddev"
+                      label="frametime jitter std dev"
+                      decimal_digits="1"
+                      stat="frametimejitterstddev"/>
+            <stat_bar name="framet_99th"
+                      label="frametime 99th percentile"
+                      decimal_digits="1"
+                      stat="frametime99"/>
+            <stat_bar name="framet_95th"
+                      label="frametime 95th percentile"
+                      decimal_digits="1"
+                      stat="frametime95"/>
+            <stat_bar name="framet_stddev"
+                      label="frametime std dev"
+                      decimal_digits="1"
+                      stat="frametimestddev"/>
+            <stat_bar name="framet_events"
+                      label="frametime events"
+                      decimal_digits="0"
+                      stat="frametimeevents"/>
           <stat_bar name="ktrisframe"
                     label="KTris per Frame"
                     unit_label="ktris/fr"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 473e54812d..de6132aec6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -410,7 +410,7 @@
         <item
             label="Friends' objects"
             name="media_first_click_friend"
-            value="11"/>
+            value="7"/>
         <item
             label="Group objects"
             name="media_first_click_group"