livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seems I'm the first one actually testing this new placebo performance floater...

master
Ansariel 2021-11-09 16:41:30 +01:00
parent 87ae9099e2
commit 7ce67261c6
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/fsfloaterperformance.cpp
View File

@ -109,26 +109,29 @@ BOOL FSFloaterPerformance::postBuild()
mComplexityPanel = getChild<LLPanel>("panel_performance_complexity");
mSettingsPanel = getChild<LLPanel>("panel_performance_preferences");
mHUDsPanel = getChild<LLPanel>("panel_performance_huds");
mAutoTunePanel = getChild<LLPanel>("panel_performance_autotune");
// Doesn't exist
//mAutoTunePanel = getChild<LLPanel>("panel_performance_autotune");
getChild<LLPanel>("nearby_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mNearbyPanel));
getChild<LLPanel>("complexity_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mComplexityPanel));
getChild<LLPanel>("settings_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mSettingsPanel));
getChild<LLPanel>("huds_subpanel")->setMouseDownCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mHUDsPanel));
auto tgt_panel = getChild<LLPanel>("target_subpanel");
if (tgt_panel)
{
tgt_panel->getChild<LLButton>("target_button")->setCommitCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel));
// tgt_panel->getChild<LLTextBox>("fwd_lbl")->setShowCursorHand(false);
// tgt_panel->getChild<LLTextBox>("fwd_lbl")->setSoundFlags(LLView::MOUSE_UP);
// tgt_panel->getChild<LLTextBox>("fwd_lbl")->setClickedCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel));
}
// Doesn't exist
//auto tgt_panel = getChild<LLPanel>("target_subpanel");
//if (tgt_panel)
//{
// tgt_panel->getChild<LLButton>("target_button")->setCommitCallback(boost::bind(&FSFloaterPerformance::showSelectedPanel, this, mAutoTunePanel));
// // tgt_panel->getChild<LLTextBox>("fwd_lbl")->setShowCursorHand(false);
// // tgt_panel->getChild<LLTextBox>("fwd_lbl")->setSoundFlags(LLView::MOUSE_UP);
// // tgt_panel->getChild<LLTextBox>("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<LLNameListCtrl>("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)

2
indra/newview/fsfloaterperformance.h
View File

@ -79,7 +79,7 @@ private:
LLPanel* mComplexityPanel;
LLPanel* mHUDsPanel;
LLPanel* mSettingsPanel;
LLPanel* mAutoTunePanel;
//LLPanel* mAutoTunePanel; // Doesn't exist
LLNameListCtrl* mHUDList;
LLNameListCtrl* mObjectList;
LLNameListCtrl* mNearbyList;

4
indra/newview/skins/default/xui/en/floater_performance.xml
View File

@ -200,6 +200,7 @@ Frame breakdown will appear here.
min_val="1"
width="40"
label="" />
<!--
<button
height="16"
width="16"
@ -214,6 +215,7 @@ Frame breakdown will appear here.
right="-20"
is_toggle="true">
</button>
-->
</panel>
</panel>
<panel
@ -496,6 +498,7 @@ HUDs
name="panel_performance_huds"
visible="false"
top="115" />
<!--
<panel
filename="panel_performance_autotune.xml"
follows="all"
@ -504,4 +507,5 @@ HUDs
name="panel_performance_autotune"
visible="false"
top="115" />
-->
</floater>