diff options
| author | Tofu Buzzard <no-email> | 2011-02-14 19:29:59 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-14 19:29:59 -0800 |
| commit | b6eaa84f379e236eaa76adc9962d91b91df72b7f (patch) | |
| tree | a6491b27a0f3d5ddbe1064c1d8b1c33e14b396eb /indra/newview/llviewermenu.cpp | |
| parent | ef49d3f30b0ed18ae31147ff10d19e63034ceab9 (diff) | |
| parent | 681d64de0261235cbafe6b9b082344241b6fbf54 (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; } }; |