From 23cf9d3579c7be2f517cc2b515ffb1e5e3942bc9 Mon Sep 17 00:00:00 2001
From: minerjr <minerjrminerjr@hotmail.com>
Date: Thu, 23 Jan 2025 20:14:07 -0400
Subject: [PATCH] FIRE-35083 - Floater_stats.xml has incorrect stat_view
 setting for materials

Issue was caused by the stat_bar 'nummaterials' setting being used for the stat_view 'material' setting which was looking for a BOOL and was given a S32.

Only the debug release would throw a bug splat. Release would give a warning and return false.

Changes Include:
Modified setting.xml
- Added new Boolean OpenDebugStatMaterials to the settings.xml to match the naming of the other Statistics expand/collapse display settings.
Modified floater_stat.xml
- Updated the setting on the stat_bar 'nummaterials' to use the DebugStatModeMaterials setting.
- Updated the setting on the stat_view 'material' to use the OpenDebugStatMaterials setting.
---
 indra/newview/app_settings/settings.xml            | 14 ++++++++++++++
 .../newview/skins/default/xui/en/floater_stats.xml |  9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f23ae785a2..77d07bd7d5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9242,6 +9242,20 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <!-- <FS:minerjr> [FIRE-35083] Floater_stats.xml has in correct stat_view setting for materials -->
+    <!-- Missing boolean flag for remembering the open/close state of the Materials stat_view of the floater_stats.xml file -->
+    <key>OpenDebugStatMaterials</key>
+    <map>
+        <key>Comment</key>
+        <string>Expand Materials performance stats display</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>1</integer>
+    </map>
+    <!-- </FS:minerjr> [FIRE-35083] -->
     <key>OpenDebugStatTexture</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index cb52fca190..2b5cc98f3a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -155,13 +155,18 @@
                     stat="glboundmemstat"
                     setting="DebugStatModeBoundMem"/>
         </stat_view>
+          <!-- <FS:minerjr> [FIRE-35083] Floater_stats.xml has in correct stat_view setting for materials -->
+          <!-- The material stat_view had the incorrect setting, which was causing and convert_from_llsd warning and a bugsplat in Debug mode -->
+          <!-- It also prevented the material count of the floater_stats from remembering its open/close state -->
        <stat_view name="material"
                   label="Material"
-                  setting="DebugStatModeMaterials">
+                  setting="OpenDebugStatMaterials">
          <stat_bar name="nummaterials"
                    label="Count"
-                   stat="nummaterials"/>
+                   stat="nummaterials"
+                   setting="DebugStatModeMaterials"/>
        </stat_view>
+          <!-- </FS:minerjr> [FIRE-35083] -->
         <stat_view name="network"
                    label="Network"
                    setting="OpenDebugStatNet">