diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-10 11:17:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-10 11:17:18 -0500 |
| commit | 322b19d698b68e704100c0bf78d51bd9550b1fa2 (patch) | |
| tree | a4b1c88388bdd3751f1ebdf4313c85ffbe5b671e /indra/newview | |
| parent | 4cd133fe00ae952cd24f6be4493ecadbc425757e (diff) | |
| parent | bfbf64f39aefd747a81d48dc7b4eed75443e6dff (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llwlparamset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |