diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
| commit | b3c010ea7130331d454c480b82d1309bac712004 (patch) | |
| tree | 8f5e2ba709ebd52400f2831785e0c07c3396815f /indra/newview/llwlparamset.cpp | |
| parent | d65f09ebcafe6ca968236a9991961983d4cd7a47 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Pull merge lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rwxr-xr-x | indra/newview/llwlparamset.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index b04d30db55..dba3970635 100755 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -33,6 +33,7 @@ #include "llglslshader.h" #include "lluictrlfactory.h" #include "llsliderctrl.h" +#include "pipeline.h" #include <llgl.h> @@ -127,6 +128,13 @@ void LLWLParamSet::update(LLGLSLShader * shader) const } } } + + if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && !LLPipeline::sUnderWaterRender) + { + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); + } else { + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); + } } void LLWLParamSet::set(const std::string& paramName, float x) |