From 12f18ff4614225093f753b16cfd278880eca0387 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 15 Aug 2023 16:46:35 +0200
Subject: SL-20146 Statistic bar collapsed/expanded accordions not saving

---
 indra/newview/app_settings/settings.xml            | 46 +++++++---
 .../newview/skins/default/xui/en/floater_stats.xml | 98 ++++++++++++----------
 2 files changed, 86 insertions(+), 58 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c700302221..23e97ebad1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7485,10 +7485,21 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>OpenDebugStatBasic</key>
+    <map>
+      <key>Comment</key>
+      <string>Expand Basic performance stats display</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
-      <string>Expand advanced performance stats display</string>
+      <string>Expand Advanced performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7496,10 +7507,10 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>OpenDebugStatBasic</key>
+    <key>OpenDebugStatRender</key>
     <map>
       <key>Comment</key>
-      <string>Expand basic performance stats display</string>
+      <string>Expand Render performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7507,10 +7518,21 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatNet</key>
+    <key>OpenDebugStatTexture</key>
+    <map>
+      <key>Comment</key>
+      <string>Expand Texture performance stats display</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>OpenDebugStatMemory</key>
     <map>
       <key>Comment</key>
-      <string>Expand network stats display</string>
+      <string>Expand Memory Usage stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7518,10 +7540,10 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatRender</key>
+    <key>OpenDebugStatNet</key>
     <map>
       <key>Comment</key>
-      <string>Expand render stats display</string>
+      <string>Expand Network performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7532,7 +7554,7 @@
     <key>OpenDebugStatSim</key>
     <map>
       <key>Comment</key>
-      <string>Expand simulator performance stats display</string>
+      <string>Expand Simulator performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7540,10 +7562,10 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatTexture</key>
+    <key>OpenDebugStatPhysicsDetails</key>
     <map>
       <key>Comment</key>
-      <string>Expand Texture performance stats display</string>
+      <string>Expand Physics Details performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7551,10 +7573,10 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>OpenDebugStatPhysicsDetails</key>
+    <key>OpenDebugStatPathfinding</key>
     <map>
       <key>Comment</key>
-      <string>Expand Physics Details performance stats display</string>
+      <string>Expand Pathfinding performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index b9ca0108b6..0fde6a329a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -25,7 +25,7 @@
                     name="statistics_view"
                     top="20"
                     width="250" >
-     <stat_view name="basic"
+      <stat_view name="basic"
                  label="Basic"
                  setting="OpenDebugStatBasic">
         <stat_bar name="fps"
@@ -54,7 +54,7 @@
                   label="jitter"
                   decimal_digits="1"
                   stat="frametimejitter"/>
-       <stat_bar name="bandwidth"
+        <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
                   decimal_digits="0"
@@ -68,7 +68,7 @@
                   stat="simpingstat"/>
       </stat_view>
 
-     <stat_view name="advanced"
+      <stat_view name="advanced"
                  label="Advanced"
                  setting="OpenDebugStatAdvanced">
         <stat_view name="render"
@@ -84,28 +84,29 @@
           <stat_bar name="totalobjs"
                     label="Total Objects"
                     stat="numobjectsstat"/>
-					<stat_bar name="cachedobjs"
+          <stat_bar name="cachedobjs"
                     label="Cached Objects"
                     stat="numactivecachedobjects"/>
-					<stat_bar name="newobjs"
+          <stat_bar name="newobjs"
                     label="New Objects"
                     stat="numnewobjectsstat"/>
           <stat_bar name="object_cache_hits"
                     label="Object Cache Hit Rate"
                     stat="object_cache_hits"
                     show_history="true"/>
-					<stat_bar name="occlusion_queries"
-										label="Occlusion Queries Performed"
-										stat="occlusion_queries"/>
-					<stat_bar name="occluded"
-										label="Objects Occluded"
-										stat="occluded_objects"/>
-					<stat_bar name="unoccluded"
-										label="Object Unoccluded"
-										stat="unoccluded_objects"/>
-				</stat_view>
+          <stat_bar name="occlusion_queries"
+                    label="Occlusion Queries Performed"
+                    stat="occlusion_queries"/>
+          <stat_bar name="occluded"
+                    label="Objects Occluded"
+                    stat="occluded_objects"/>
+          <stat_bar name="unoccluded"
+                    label="Object Unoccluded"
+                    stat="unoccluded_objects"/>
+        </stat_view>
         <stat_view name="texture"
-                   label="Texture">
+                   label="Texture"
+                   setting="OpenDebugStatTexture">
           <stat_bar name="texture_cache_hits"
                     label="Cache Hit Rate"
                     stat="texture_cache_hits"
@@ -133,54 +134,55 @@
                     label="Bound Mem"
                     stat="glboundmemstat"/>
         </stat_view>
-			 <stat_view name="memory"
-									label="Memory Usage">
-				 <stat_bar name="LLTrace"
+        <stat_view name="memory"
+                   label="Memory Usage"
+                   setting="OpenDebugStatMemory">
+          <stat_bar name="LLTrace"
                     label="LLTrace"
                     stat="LLTrace"/>
-				 <stat_bar name="LLView"
+          <stat_bar name="LLView"
                     label="UI"
                     stat="LLView"/>
-				 <stat_bar name="LLFontFreetype"
+          <stat_bar name="LLFontFreetype"
                     label="Fonts"
                     stat="LLFontFreetype"/>
-				 <stat_bar name="LLInventoryObject"
+          <stat_bar name="LLInventoryObject"
                     label="Inventory"
                     stat="LLInventoryObject"/>
-				 <stat_bar name="LLViewerObject"
+          <stat_bar name="LLViewerObject"
                     label="Viewer Objects"
                     stat="LLViewerObject"/>
-				 <stat_bar name="LLViewerOctreeGroup"
-									 label="Octree Group Data"
-									 stat="LLViewerOctreeGroup"/>
-				 <stat_bar name="LLViewerOctreeEntry"
-									 label="Octree Data"
-									 stat="LLViewerOctreeEntry"/>
-				 <stat_bar name="LLVOCacheEntry"
+          <stat_bar name="LLViewerOctreeGroup"
+                    label="Octree Group Data"
+                    stat="LLViewerOctreeGroup"/>
+          <stat_bar name="LLViewerOctreeEntry"
+                    label="Octree Data"
+                    stat="LLViewerOctreeEntry"/>
+          <stat_bar name="LLVOCacheEntry"
                     label="Viewer Object Cache"
                     stat="LLVOCacheEntry"/>
-				 <stat_bar name="LLDrawable"
+          <stat_bar name="LLDrawable"
                     label="Drawables"
                     stat="LLDrawable"/>
-         <stat_bar name="LLFace"
-                     label="Face Data"
-                     stat="LLFace"/>
+          <stat_bar name="LLFace"
+                    label="Face Data"
+                    stat="LLFace"/>
           <stat_bar name="LLDrawInfo"
-                     label="Draw Info"
-                     stat="LLDrawInfo"/>
+                    label="Draw Info"
+                    stat="LLDrawInfo"/>
           <stat_bar name="LLTexture"
-                     label="Texture Data"
-                     stat="LLTexture"/>
-				 <stat_bar name="LLImage"
+                    label="Texture Data"
+                    stat="LLTexture"/>
+          <stat_bar name="LLImage"
                     label="Image Data"
                     stat="LLImage"/>
-				 <stat_bar name="LLImageGL"
+          <stat_bar name="LLImageGL"
                     label="GL Image Data"
                     stat="LLImageGL"/>
-				 <stat_bar name="LLVertexBuffer"
+          <stat_bar name="LLVertexBuffer"
                     label="Vertex Buffers"
                     stat="LLVertexBuffer"/>
-			 </stat_view>
+        </stat_view>
         <stat_view name="network"
                    label="Network"
                    setting="OpenDebugStatNet">
@@ -237,7 +239,8 @@
                   decimal_digits="1"
                   bar_max="45" />
         <stat_view name="physicsdetail"
-                   label="Physics Details">
+                   label="Physics Details"
+                   setting="OpenDebugStatPhysicsDetails">
           <stat_bar name="physicspinnedtasks"
                     label="Pinned Objects"
                     stat="physicspinnedtasks"/>
@@ -276,7 +279,8 @@
                   stat="simscripteps"
                   unit_label="eps"/>
         <stat_view name="simpathfinding"
-                   label="Pathfinding">
+                   label="Pathfinding"
+                   setting="OpenDebugStatPathfinding">
           <stat_bar name="simsimaistepmsec"
                     label="AI Step Time"
                     stat="simsimaistepmsec"/>
@@ -309,7 +313,8 @@
                   stat="simtotalunackedbytes"
                   decimal_digits="1"/>
         <stat_view name="simperf"
-                   label="Time">
+                   label="Time"
+                   setting="OpenDebugStatSimTime">
           <stat_bar name="simframemsec"
                     label="Total Frame Time"
                     stat="simframemsec"/>
@@ -335,7 +340,8 @@
                     label="Spare Time"
                     stat="simsparemsec"/>
           <stat_view name="timedetails"
-                     label="Time Details">
+                     label="Time Details"
+                     setting="OpenDebugStatSimTimeDetails">
             <stat_bar name="simsimphysicsstepmsec"
                       label="Physics Step"
                       stat="simsimphysicsstepmsec"/>
-- 
cgit v1.2.3