diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
| commit | 03c738d0c9df57a786803a292bc766e78d014749 (patch) | |
| tree | 08c8e8529056d12240fa4e71987b54c2ce28d2f4 /indra/newview/llviewermenu.cpp | |
| parent | d8e04b9d31b0c77289f5f770f2a9b54506650151 (diff) | |
| parent | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index cfcce3e7bb..37aa080228 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2069,7 +2069,7 @@ class LLAdvancedEnableRenderDeferred: public view_listener_t { bool handleEvent(const LLSD& userdata) { - bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT > 0) && + bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1 && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0; return new_value; } @@ -2082,7 +2082,7 @@ class LLAdvancedEnableRenderDeferredOptions: public view_listener_t { bool handleEvent(const LLSD& userdata) { - bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT > 0) && + bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1 && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0 && gSavedSettings.getBOOL("RenderDeferred"); return new_value; } |