diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-25 13:16:31 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-25 13:16:31 -0700 |
| commit | d31010512154ef1806281552f639e492bdde7fcd (patch) | |
| tree | 951ba65ec940f5bec236855490380cd43e74ebe7 /indra/newview/llwaterparammanager.cpp | |
| parent | 089081dc802a8efb41d3eda7b2eec6f9637f1c4b (diff) | |
| parent | 571920c7b4fb8966088e769c630cda3c149c4e39 (diff) | |
Merge recent viewer-bear fixes that missed the boat
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rwxr-xr-x | 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 548890b5b5..72d628fb88 100755 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -188,6 +188,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader) if (shader->mShaderGroup == LLGLSLShader::SG_WATER) { shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::getInstance()->getRotatedLightDir().mV); +shader->uniform3fv(LLShaderMgr::WL_CAMPOSLOCAL, 1, LLViewerCamera::getInstance()->getOrigin().mV); shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, LLDrawPoolWater::sWaterFogColor.mV); shader->uniform4fv(LLShaderMgr::WATER_WATERPLANE, 1, mWaterPlane.mV); shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, getFogDensity()); |