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

Fix warning "LLView::getChild: Making dummy class LLCheckBoxCtrl named "UseLightShaders2" in Preferences"; that checkbox only exists in LL's simple graphics settings

meow-7.2.2
Ansariel 2014-02-08 13:13:31 +01:00
parent d0f93cdb20
commit d2feb07b2e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llfloaterpreference.cpp
View File

@ -1618,7 +1618,7 @@ void LLFloaterPreference::refreshEnabledState()
//Deferred/SSAO/Shadows
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
//LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2"); <FS:Ansariel> We don't have that
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
@ -1629,7 +1629,7 @@ void LLFloaterPreference::refreshEnabledState()
(ctrl_wind_light->get()) ? TRUE : FALSE;
ctrl_deferred->setEnabled(enabled);
ctrl_deferred2->setEnabled(enabled);
//ctrl_deferred2->setEnabled(enabled); <FS:Ansariel> We don't have that
// <FS:Ansariel> Tofu's SSR
getChild<LLCheckBoxCtrl>("FSRenderSSR")->setEnabled(enabled && (ctrl_deferred->get() ? TRUE : FALSE) && gSavedSettings.getS32("RenderShadowDetail") > 0);
@ -1666,7 +1666,7 @@ void LLFloaterPreference::disableUnavailableSettings()
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
LLCheckBoxCtrl* ctrl_avatar_impostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
//LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2"); <FS:Ansariel> We don't have that
LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
@ -1702,8 +1702,9 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
ctrl_deferred2->setEnabled(FALSE);
ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> We don't have that
//ctrl_deferred2->setEnabled(FALSE);
//ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
@ -1728,8 +1729,9 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
ctrl_deferred2->setEnabled(FALSE);
ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> We don't have that
//ctrl_deferred2->setEnabled(FALSE);
//ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
@ -1751,8 +1753,9 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
ctrl_deferred2->setEnabled(FALSE);
ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> We don't have that
//ctrl_deferred2->setEnabled(FALSE);
//ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
@ -1805,8 +1808,9 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
ctrl_deferred2->setEnabled(FALSE);
ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> We don't have that
//ctrl_deferred2->setEnabled(FALSE);
//ctrl_deferred2->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);