diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 10:25:26 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 10:25:26 +0100 |
commit | fd0b287be34f0d90b02c332494c96769c6ebb912 (patch) | |
tree | 4b675e9d6e6b21836e035ed3508b4dde55e6d061 /indra/newview/llviewershadermgr.cpp | |
parent | 722c8af1121f3edbcef6c5478c31339177fac802 (diff) |
EXT-7168
Fix the tying of the deferred prefs UI to the featuretable.
(transplanted from 3196941d73f122f5dbe42aa0ffdc28a2470ea089)
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index e64fdfc0b4..49eeffe228 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -391,7 +391,8 @@ void LLViewerShaderMgr::setShaders() S32 water_class = 2; S32 deferred_class = 0; - if (gSavedSettings.getBOOL("RenderDeferred")) + if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + gSavedSettings.getBOOL("RenderDeferred")) { if (gSavedSettings.getS32("RenderShadowDetail") > 0) { |