1 files changed, 10 insertions, 11 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 567172e647..bdf04bd436 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -488,22 +488,21 @@ void LLDrawPoolWater::shade()
 	LLVector3 light_dir;
 	LLColor3 light_color;
 
-    LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
     LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
 
-    light_dir = psky->getLightDirection();
+    light_dir = voskyp->getLightDirection();
     if (LLEnvironment::instance().getIsDayTime())
     {
-        light_color = psky->getSunAmbient();
-        light_diffuse = psky->getSunDiffuse(); 
+        light_color = voskyp->getSunAmbientColor();
+        light_diffuse = voskyp->getSunDiffuseColor(); 
         light_diffuse.normalize();
         light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);
         light_diffuse *= (light_exp + 0.25f);
     }
     else
     {
-        light_color = psky->getMoonAmbient();
-        light_diffuse = psky->getMoonDiffuse();
+        light_color = voskyp->getMoonAmbientColor();
+        light_diffuse = voskyp->getMoonDiffuseColor();
         light_diffuse.normalize();
         light_diffuse *= 0.5f;
         light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);
@@ -609,8 +608,8 @@ void LLDrawPoolWater::shade()
 		
 	if (screentex > -1)
 	{
-		shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getFogColor().mV);
-        shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getFogDensity());
+		shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV);
+        shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity());
 		gPipeline.mWaterDis.bindTexture(0, screentex);
 	}
 	
@@ -620,8 +619,8 @@ void LLDrawPoolWater::shade()
 
 	if (mVertexShaderLevel == 1)
 	{
-        LLColor4 fog_color(pwater->getFogColor(), 0.f);
-        fog_color[3] = pwater->getFogDensity();
+        LLColor4 fog_color(pwater->getWaterFogColor(), 0.f);
+        fog_color[3] = pwater->getWaterFogDensity();
         shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, fog_color.mV);
 	}
 
@@ -706,7 +705,7 @@ void LLDrawPoolWater::shade()
 			}
 			else
 			{
-				LLGLSquashToFarClip far_clip(glh_get_current_projection());
+				LLGLSquashToFarClip far_clip(get_current_projection());
 				face->renderIndexed();
 			}
 		}