diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-09 14:01:31 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-09 14:01:31 -0700 |
| commit | 0f3cbfafcbdf86e205bebe2fc82488cba0bb75b7 (patch) | |
| tree | 6aeced2145cc791fdf9f4e4061c910c7ed5a4728 /indra | |
| parent | 0ee0f952c29e0b8bdcfe332823adbdab86190c71 (diff) | |
NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b45c944a5f..55b03986d0 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1149,7 +1149,7 @@ void LLFloaterPreference::refreshEnabledState() //Deferred/SSAO/Shadows LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders"); - BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && ((bumpshiny_ctrl && bumpshiny_ctrl->get()) ? TRUE : FALSE) && shaders && gGLManager.mHasFramebufferObject && @@ -1163,7 +1163,9 @@ void LLFloaterPreference::refreshEnabledState() LLComboBox* ctrl_shadow = getChild<LLComboBox>("ShadowDetail"); enabled = enabled && LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferredSSAO") && (ctrl_deferred->get() ? TRUE : FALSE); - + + ctrl_deferred->set(gSavedSettings.getBOOL("RenderDeferred")); + ctrl_ssao->setEnabled(enabled); ctrl_dof->setEnabled(enabled); |