From 7ce67261c65ff95621ec79c128e8e3141a8df275 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 9 Nov 2021 16:41:30 +0100 Subject: [PATCH] Seems I'm the first one actually testing this new placebo performance floater... --- indra/newview/fsfloaterperformance.cpp | 26 +++++++++++-------- indra/newview/fsfloaterperformance.h | 2 +- .../default/xui/en/floater_performance.xml | 4 +++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/indra/newview/fsfloaterperformance.cpp b/indra/newview/fsfloaterperformance.cpp index 19a5ddc4e5..3a110b4f3c 100644 --- a/indra/newview/fsfloaterperformance.cpp +++ b/indra/newview/fsfloaterperformance.cpp @@ -109,26 +109,29 @@ BOOL FSFloaterPerformance::postBuild() mComplexityPanel = getChild("panel_performance_complexity"); mSettingsPanel = getChild("panel_performance_preferences"); mHUDsPanel = getChild("panel_performance_huds"); - mAutoTunePanel = getChild("panel_performance_autotune"); + // Doesn't exist + //mAutoTunePanel = getChild("panel_performance_autotune"); getChild("nearby_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mNearbyPanel)); getChild("complexity_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mComplexityPanel)); getChild("settings_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mSettingsPanel)); getChild("huds_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mHUDsPanel)); - auto tgt_panel = getChild("target_subpanel"); - if (tgt_panel) - { - tgt_panel->getChild("target_button")->setCommitCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel)); - // tgt_panel->getChild("fwd_lbl")->setShowCursorHand(false); - // tgt_panel->getChild("fwd_lbl")->setSoundFlags(LLView::MOUSE_UP); - // tgt_panel->getChild("fwd_lbl")->setClickedCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel)); - } + // Doesn't exist + //auto tgt_panel = getChild("target_subpanel"); + //if (tgt_panel) + //{ + // tgt_panel->getChild("target_button")->setCommitCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel)); + // // tgt_panel->getChild("fwd_lbl")->setShowCursorHand(false); + // // tgt_panel->getChild("fwd_lbl")->setSoundFlags(LLView::MOUSE_UP); + // // tgt_panel->getChild("fwd_lbl")->setClickedCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel)); + //} initBackBtn(mNearbyPanel); initBackBtn(mComplexityPanel); initBackBtn(mSettingsPanel); initBackBtn(mHUDsPanel); - initBackBtn(mAutoTunePanel); + // Doesn't exist + //initBackBtn(mAutoTunePanel); mHUDList = mHUDsPanel->getChild("hud_list"); mHUDList->setNameListType(LLNameListCtrl::SPECIAL); @@ -360,7 +363,8 @@ void FSFloaterPerformance::hidePanels() mComplexityPanel->setVisible(FALSE); mHUDsPanel->setVisible(FALSE); mSettingsPanel->setVisible(FALSE); - mAutoTunePanel->setVisible(FALSE); + // Doesn't exist + //mAutoTunePanel->setVisible(FALSE); } void FSFloaterPerformance::initBackBtn(LLPanel* panel) diff --git a/indra/newview/fsfloaterperformance.h b/indra/newview/fsfloaterperformance.h index 37a0cd41d6..083c639376 100644 --- a/indra/newview/fsfloaterperformance.h +++ b/indra/newview/fsfloaterperformance.h @@ -79,7 +79,7 @@ private: LLPanel* mComplexityPanel; LLPanel* mHUDsPanel; LLPanel* mSettingsPanel; - LLPanel* mAutoTunePanel; + //LLPanel* mAutoTunePanel; // Doesn't exist LLNameListCtrl* mHUDList; LLNameListCtrl* mObjectList; LLNameListCtrl* mNearbyList; diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml index e09176eac4..e08056ff5d 100644 --- a/indra/newview/skins/default/xui/en/floater_performance.xml +++ b/indra/newview/skins/default/xui/en/floater_performance.xml @@ -200,6 +200,7 @@ Frame breakdown will appear here. min_val="1" width="40" label="" /> + +