diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
| commit | 492f820c6b8a164cb201fed232e40e743e8e38c4 (patch) | |
| tree | 7d360ddc2ff2288d1ec8163b6215cf9c81031b51 /indra/newview/llwaterparammanager.cpp | |
| parent | 1c58b3b18ea732e0032e70ae6dc9c8ec2f2834b4 (diff) | |
| parent | 34c01b6b1ff758463dcdff19782e5af668699304 (diff) | |
merge
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | indra/newview/llwaterparammanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 1a98d4c6c2..20b34637b8 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -190,6 +190,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader) shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::getInstance()->getRotatedLightDir().mV); shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV); shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV); + shader->uniform1f("waterFogEnd", LLDrawPoolWater::sWaterFogEnd); shader->uniform4fv("waterPlane", 1, mWaterPlane.mV); shader->uniform1f("waterFogDensity", getFogDensity()); shader->uniform1f("waterFogKS", mWaterFogKS); |