summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-05-25 10:51:38 -0500
committerDave Parks <davep@lindenlab.com>2012-05-25 10:51:38 -0500
commitabaf0155b47c5e020efa7e4600524c0c6d49319f (patch)
tree36de62212ecd8903579a648e8f4793a169fa981a /indra/newview/llviewercontrol.cpp
parentc0de0645ee59721907bfead962a3e3f4c1654ca6 (diff)
MAINT-616 Faster issuance of occlusion queries.
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r--indra/newview/llviewercontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 093b84413a..385439ae70 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -316,7 +316,7 @@ static bool handleJoystickChanged(const LLSD& newvalue)
static bool handleUseOcclusionChanged(const LLSD& newvalue)
{
- LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery
+ LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery && LLGLSLShader::sNoFixedFunction
&& LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0;
return true;
}