diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
commit | cfb666e9d9eb8945a79e2f7999459267caca36ee (patch) | |
tree | b02e73c02f6f377c99fffc950d72525516647f52 /indra/newview/llwaterparammanager.cpp | |
parent | 09c74484ae0df267f01610ab4b594e50a01c05c1 (diff) | |
parent | b493b8cca491c4b7a76f4c98b34272970d3bb58b (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); |