From bc0e12b3567091c3e183d917d250bdd9e9101dc0 Mon Sep 17 00:00:00 2001 From: Northspring Date: Sun, 19 Apr 2015 16:54:09 +0200 Subject: [PATCH] Add a hidden debug option to give a choice to open Statistics window instead of the Lag Meter one --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llstatusbar.cpp | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7524c2efca..e6542779c4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -23285,6 +23285,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSUseStatsInsteadOfLagMeter + + Comment + Clicking on traffic indicator (upper right) toggles Statistics window, not the Lag Meter window + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 217a5db23c..6e747d43d6 100755 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -928,7 +928,14 @@ void LLStatusBar::onVolumeChanged(const LLSD& newvalue) // FIRE-6287: Clicking on traffic indicator toggles Lag Meter window void LLStatusBar::onBandwidthGraphButtonClicked() { - LLFloaterReg::toggleInstance("lagmeter"); + if (gSavedSettings.getBOOL("FSUseStatsInsteadOfLagMeter")) + { + LLFloaterReg::toggleInstance("stats"); + } + else + { + LLFloaterReg::toggleInstance("lagmeter"); + } } // FIRE-6287: Clicking on traffic indicator toggles Lag Meter window