From 12f18ff4614225093f753b16cfd278880eca0387 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Tue, 15 Aug 2023 16:46:35 +0200 Subject: SL-20146 Statistic bar collapsed/expanded accordions not saving --- indra/llui/llcontainerview.cpp | 2 +- indra/llui/llcontainerview.h | 2 +- indra/llui/llstatview.cpp | 3 - indra/llui/llstatview.h | 4 +- indra/newview/app_settings/settings.xml | 46 +++++++--- .../newview/skins/default/xui/en/floater_stats.xml | 98 ++++++++++++---------- 6 files changed, 90 insertions(+), 65 deletions(-) diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp index 727fbe850e..1c33088e8d 100644 --- a/indra/llui/llcontainerview.cpp +++ b/indra/llui/llcontainerview.cpp @@ -288,7 +288,7 @@ void LLContainerView::setLabel(const std::string& label) mLabel = label; } -void LLContainerView::setDisplayChildren(const BOOL displayChildren) +void LLContainerView::setDisplayChildren(BOOL displayChildren) { mDisplayChildren = displayChildren; for (child_list_const_iter_t child_iter = getChildList()->begin(); diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h index 99267d978a..8e75aaef6e 100644 --- a/indra/llui/llcontainerview.h +++ b/indra/llui/llcontainerview.h @@ -78,7 +78,7 @@ public: void setLabel(const std::string& label); void showLabel(BOOL show) { mShowLabel = show; } - void setDisplayChildren(const BOOL displayChildren); + void setDisplayChildren(BOOL displayChildren); BOOL getDisplayChildren() { return mDisplayChildren; } void setScrollContainer(LLScrollContainer* scroll) {mScrollContainer = scroll;} diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp index bb4969c81f..03f2fb7cc0 100644 --- a/indra/llui/llstatview.cpp +++ b/indra/llui/llstatview.cpp @@ -58,10 +58,7 @@ LLStatView::~LLStatView() } } - static StatViewRegistry::Register r1("stat_bar"); static StatViewRegistry::Register r2("stat_view"); // stat_view can be a child of panels/etc. static LLDefaultChildRegistry::Register r3("stat_view"); - - diff --git a/indra/llui/llstatview.h b/indra/llui/llstatview.h index af4db7d7ea..044f0a8679 100644 --- a/indra/llui/llstatview.h +++ b/indra/llui/llstatview.h @@ -63,7 +63,7 @@ protected: friend class LLUICtrlFactory; protected: - std::string mSetting; - + const std::string mSetting; }; + #endif // LL_STATVIEW_ 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 @@ Value 1 + OpenDebugStatBasic + + Comment + Expand Basic performance stats display + Persist + 1 + Type + Boolean + Value + 1 + OpenDebugStatAdvanced Comment - Expand advanced performance stats display + Expand Advanced performance stats display Persist 1 Type @@ -7496,10 +7507,10 @@ Value 0 - OpenDebugStatBasic + OpenDebugStatRender Comment - Expand basic performance stats display + Expand Render performance stats display Persist 1 Type @@ -7507,10 +7518,21 @@ Value 1 - OpenDebugStatNet + OpenDebugStatTexture + + Comment + Expand Texture performance stats display + Persist + 1 + Type + Boolean + Value + 0 + + OpenDebugStatMemory Comment - Expand network stats display + Expand Memory Usage stats display Persist 1 Type @@ -7518,10 +7540,10 @@ Value 1 - OpenDebugStatRender + OpenDebugStatNet Comment - Expand render stats display + Expand Network performance stats display Persist 1 Type @@ -7532,7 +7554,7 @@ OpenDebugStatSim Comment - Expand simulator performance stats display + Expand Simulator performance stats display Persist 1 Type @@ -7540,10 +7562,10 @@ Value 1 - OpenDebugStatTexture + OpenDebugStatPhysicsDetails Comment - Expand Texture performance stats display + Expand Physics Details performance stats display Persist 1 Type @@ -7551,10 +7573,10 @@ Value 0 - OpenDebugStatPhysicsDetails + OpenDebugStatPathfinding Comment - Expand Physics Details performance stats display + Expand Pathfinding performance stats display Persist 1 Type 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" > - - - - - - - - - + + + + + label="Texture" + setting="OpenDebugStatTexture"> - - + - - - - - - - + + - - + + label="Draw Info" + stat="LLDrawInfo"/> - + - - - + @@ -237,7 +239,8 @@ decimal_digits="1" bar_max="45" /> + label="Physics Details" + setting="OpenDebugStatPhysicsDetails"> @@ -276,7 +279,8 @@ stat="simscripteps" unit_label="eps"/> + label="Pathfinding" + setting="OpenDebugStatPathfinding"> @@ -309,7 +313,8 @@ stat="simtotalunackedbytes" decimal_digits="1"/> + label="Time" + setting="OpenDebugStatSimTime"> @@ -335,7 +340,8 @@ label="Spare Time" stat="simsparemsec"/> + label="Time Details" + setting="OpenDebugStatSimTimeDetails"> -- cgit v1.2.3