Automated merge with https://bitbucket.org/lindenlab/viewer-cat

1 files changed, 5 insertions, 15 deletions

diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 376715a2d6..548890b5b5 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -57,14 +57,6 @@
 
 #include "curl/curl.h"
 
-static LLStaticHashedString sCamPosLocal("camPosLocal");

-static LLStaticHashedString sWaterFogColor("waterFogColor");

-static LLStaticHashedString sWaterFogEnd("waterFogEnd");

-static LLStaticHashedString sWaterPlane("waterPlane");

-static LLStaticHashedString sWaterFogDensity("waterFogDensity");

-static LLStaticHashedString sWaterFogKS("waterFogKS");

-static LLStaticHashedString sDistanceMultiplier("distance_multiplier");
-
 LLWaterParamManager::LLWaterParamManager() :
 	mFogColor(22.f/255.f, 43.f/255.f, 54.f/255.f, 0.0f, 0.0f, "waterFogColor", "WaterFogColor"),
 	mFogDensity(4, "waterFogDensity", 2),
@@ -196,13 +188,11 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 	if (shader->mShaderGroup == LLGLSLShader::SG_WATER)
 	{
 		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::getInstance()->getRotatedLightDir().mV);
-		shader->uniform3fv(sCamPosLocal, 1, LLViewerCamera::getInstance()->getOrigin().mV);
-		shader->uniform4fv(sWaterFogColor, 1, LLDrawPoolWater::sWaterFogColor.mV);
-		shader->uniform1f(sWaterFogEnd, LLDrawPoolWater::sWaterFogEnd);
-		shader->uniform4fv(sWaterPlane, 1, mWaterPlane.mV);
-		shader->uniform1f(sWaterFogDensity, getFogDensity());
-		shader->uniform1f(sWaterFogKS, mWaterFogKS);
-		shader->uniform1f(sDistanceMultiplier, 0);
+		shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, LLDrawPoolWater::sWaterFogColor.mV);
+		shader->uniform4fv(LLShaderMgr::WATER_WATERPLANE, 1, mWaterPlane.mV);
+		shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, getFogDensity());
+		shader->uniform1f(LLShaderMgr::WATER_FOGKS, mWaterFogKS);
+		shader->uniform1f(LLViewerShaderMgr::DISTANCE_MULTIPLIER, 0);
 	}
 }