Add LLVoSky wrapper for current env sky light direction.

Make LLVo classes use LLVoSky wrappers instead of direct access.

Isolate more legacy haze param usage w/in settings.

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 5c92cf9fce..493c619a99 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);