summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-04 10:25:26 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-04 10:25:26 +0100
commit866f5ec559827aac76f35589be0ea6eca961053f (patch)
tree981bad95ccc8062d9cd7162069296a70c8d065b2 /indra/newview/llviewershadermgr.cpp
parentb7a3582374c8281919d6b4f52f30a80e1f2c31ce (diff)
EXT-7168
Fix the tying of the deferred prefs UI to the featuretable.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r--indra/newview/llviewershadermgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index a0d0b9d490..0e29851778 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -375,7 +375,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)
{