diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
| commit | 3f82f7ce3d4fb51407f366b2ad2f15d990de40b2 (patch) | |
| tree | 45be0f3213f0e095d9a7929c693f4671c8b58e08 /indra/newview/llviewercontrol.cpp | |
| parent | 01317a2faded53c79db7e0814426f1d8b2fd12fc (diff) | |
| parent | abd7d80048529fd971e1b65ea3afe0f7e78bd356 (diff) | |
Merged in euclid-pre-16386 (pull request #793)
Purge LLGLSLShader::sNoFixedFunction, and all that flows from it. No functional changes.
Approved-by: Michael Pohoreski
Approved-by: Dave Parks
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 3c6c9c905a..19b25a01fe 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -388,7 +388,7 @@ static bool handleJoystickChanged(const LLSD& newvalue) static bool handleUseOcclusionChanged(const LLSD& newvalue) { - LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery && LLGLSLShader::sNoFixedFunction + LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0; return true; } |