diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
| commit | bedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch) | |
| tree | f11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/newview/llviewercontrol.cpp | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | f3afac420cd3c89eb396fb1f0b77ab4804212415 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index f2712e7590..0d361a2646 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -325,7 +325,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; } |