Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer

2012-07-10 06:07:56 +02:00
parent c71c7ca7cc 42c7a30280
commit 6868e2f7c1
5 changed files with 276 additions and 30 deletions
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -377,8 +377,12 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)

 static bool handleUseOcclusionChanged(const LLSD& newvalue)
 {
-	LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery 
-		&& LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0;
+	LLPipeline::sUseOcclusion = 
+			(!gUseWireframe
+			&& LLGLSLShader::sNoFixedFunction
+			&& LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") 
+			&& newvalue.asBoolean() 
+			&& gGLManager.mHasOcclusionQuery) ? 2 : 0;
 	return true;
 }