Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate LLFloaterHardwareSettings into a tab in LLPanelDisplay

Browse Source 
Still not translated, left the old translated floaters for easier translation.
New Hardware Tab is work in progress, it should be more populated in the future, but is fine for now.
This commit is contained in:
Lirusaito
2012-07-25 18:11:48 -04:00
parent e116548b50
commit a7f02b3964
8 changed files with 187 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterpreference.cpp
View File

@@ -79,7 +79,6 @@
#include "llviewerwindow.h"
#include "llkeyboard.h"
#include "llscrollcontainer.h"
#include "llfloaterhardwaresettings.h"
#include "hippopanelgrids.h"
const S32 PREF_BORDER = 4;
@@ -318,9 +317,6 @@ void LLPreferenceCore::apply()
mPrefsAscentSys->apply();
mPrefsAscentVan->apply();
// hardware menu apply
LLFloaterHardwareSettings::instance()->apply();
mWebPanel->apply();
#if LL_LCD_COMPILE
// only add this option if we actually have a logitech keyboard / speaker set
@@ -350,9 +346,6 @@ void LLPreferenceCore::cancel()
mPrefsAscentSys->cancel();
mPrefsAscentVan->cancel();
// cancel hardware menu
LLFloaterHardwareSettings::instance()->cancel();
mWebPanel->cancel();
#if LL_LCD_COMPILE
// only add this option if we actually have a logitech keyboard / speaker set
@@ -380,7 +373,6 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
void LLPreferenceCore::refreshEnabledGraphics()
{
LLFloaterHardwareSettings::instance()->refreshEnabledState();
mDisplayPanel->refreshEnabledState();
}