diff options
| author | Tofu Buzzard <no-email> | 2011-02-14 19:29:31 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-14 19:29:31 -0800 |
| commit | 681d64de0261235cbafe6b9b082344241b6fbf54 (patch) | |
| tree | 662ec45b1d0eb9960a57d9abac3422c2f89103ed /indra/newview/llviewermenu.cpp | |
| parent | 9b13145314be9b599f06dd9ea26b58b05d4694df (diff) | |
| parent | cf728ab09ec12c73e95b8e2304a3b69c9460182e (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; } }; |