diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-16 15:35:05 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-02-16 15:35:05 -0500 |
| commit | 2d0f754b45a21f8e734fefb3f4b88ac65133d576 (patch) | |
| tree | ebfa99054050907c559ee540b393090d08dba0bc /indra/newview/llviewermenu.cpp | |
| parent | c10494e370f6399deea835964760628b14f7e299 (diff) | |
| parent | 8bbbcd9c22010a259d42d23c517e04fe7afd41fd (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index eb022851e7..cfcce3e7bb 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2082,7 +2082,8 @@ class LLAdvancedEnableRenderDeferredOptions: public view_listener_t { bool handleEvent(const LLSD& userdata) { - bool new_value = gSavedSettings.getBOOL("RenderDeferred"); + bool new_value = gGLManager.mHasFramebufferObject && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT > 0) && + LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0 && gSavedSettings.getBOOL("RenderDeferred"); return new_value; } }; |