diff options
Diffstat (limited to 'linden/indra/newview/llwaterparammanager.cpp')
-rw-r--r-- | linden/indra/newview/llwaterparammanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp index ae913af..f121d46 100644 --- a/linden/indra/newview/llwaterparammanager.cpp +++ b/linden/indra/newview/llwaterparammanager.cpp | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "llsliderctrl.h" | 39 | #include "llsliderctrl.h" |
40 | #include "llspinctrl.h" | 40 | #include "llspinctrl.h" |
41 | #include "llcheckboxctrl.h" | 41 | #include "llcheckboxctrl.h" |
42 | #include "llvieweruictrlfactory.h" | 42 | #include "lluictrlfactory.h" |
43 | #include "llviewercontrol.h" | 43 | #include "llviewercontrol.h" |
44 | #include "llviewercamera.h" | 44 | #include "llviewercamera.h" |
45 | #include "llcombobox.h" | 45 | #include "llcombobox.h" |
@@ -227,7 +227,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader) | |||
227 | if (shader->mShaderGroup == LLGLSLShader::SG_WATER) | 227 | if (shader->mShaderGroup == LLGLSLShader::SG_WATER) |
228 | { | 228 | { |
229 | shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV); | 229 | shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV); |
230 | shader->uniform3fv("camPosLocal", 1, gCamera->getOrigin().mV); | 230 | shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV); |
231 | shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV); | 231 | shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV); |
232 | shader->uniform4fv("waterPlane", 1, mWaterPlane.mV); | 232 | shader->uniform4fv("waterPlane", 1, mWaterPlane.mV); |
233 | shader->uniform1f("waterFogDensity", getFogDensity()); | 233 | shader->uniform1f("waterFogDensity", getFogDensity()); |