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/pipeline.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/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6abe1041f7..2e2b2c02c3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -633,10 +633,11 @@ void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY) void LLPipeline::updateRenderDeferred() { BOOL deferred = (gSavedSettings.getBOOL("RenderDeferred") && - LLRenderTarget::sUseFBO && - gSavedSettings.getBOOL("VertexShaderEnable") && - gSavedSettings.getBOOL("RenderAvatarVP") && - gSavedSettings.getBOOL("WindLightUseAtmosShaders")) ? TRUE : FALSE; + LLRenderTarget::sUseFBO && + LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && + gSavedSettings.getBOOL("VertexShaderEnable") && + gSavedSettings.getBOOL("RenderAvatarVP") && + gSavedSettings.getBOOL("WindLightUseAtmosShaders")) ? TRUE : FALSE; sRenderDeferred = deferred; } |