Still not working. Black Sky.

1 files changed, 13 insertions, 2 deletions

diff --git a/indra/newview/llsettingssky.h b/indra/newview/llsettingssky.h
index 5b8691fa8b..2fb9ff3887 100644
--- a/indra/newview/llsettingssky.h
+++ b/indra/newview/llsettingssky.h
@@ -161,12 +161,12 @@ public:
 
     F32 getGama() const
     {
-        return mSettings[SETTING_GAMMA].asReal();
+        return mSettings[SETTING_GAMMA][0].asReal();
     }
 
     LLColor3 getGlow() const
     {
-        return mSettings[SETTING_GLOW].asReal();
+        return LLColor3(mSettings[SETTING_GLOW]);
     }
 
     F32 getHazeDensity() const
@@ -179,6 +179,11 @@ public:
         return mSettings[SETTING_HAZE_HORIZON].asReal();
     }
 
+    LLVector3 getLightNormal() const
+    {
+        return LLVector3(mSettings[SETTING_LIGHT_NORMAL]);
+    }
+
     F32 getMaxY() const
     {
         return mSettings[SETTING_MAX_Y].asReal();
@@ -289,6 +294,8 @@ protected:
 
     virtual void        updateSettings();
 
+    virtual parammapping_t getParameterMap() const;
+
     virtual stringset_t getSkipApplyKeys() const;
     virtual void        applySpecial(void *);
 
@@ -309,6 +316,10 @@ private:
     
     LLColor4    mTotalAmbient;
     LLColor4    mFadeColor;
+
+    typedef std::map<std::string, S32> mapNameToUniformId_t;
+
+    static mapNameToUniformId_t sNameToUniformMapping;
 };
 
 #endif