From bfbf64f39aefd747a81d48dc7b4eed75443e6dff Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 7 Jun 2013 16:50:22 -0500
Subject: [PATCH] NORSPEC-230 Fix for incorrect gamma under water.

---
 indra/newview/llwlparamset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 0b5e0235ee..dba3970635 100755
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -129,7 +129,7 @@ void LLWLParamSet::update(LLGLSLShader * shader) const
 		}
 	}
 	
-	if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender)
+	if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && !LLPipeline::sUnderWaterRender)
 	{
 		shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2);
 	} else {
-- 
GitLab