Second Life viewer sources 1.14.0.0

1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 1617c2a..0ca56dc 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -197,7 +197,7 @@ protected:
         }
 
         LLImageRaw* getImageRaw(BOOL curr=TRUE)                 { return mImageRaw[getWhich(curr)]; }
-        void createTexture(BOOL curr=TRUE);
+        void createGLImage(BOOL curr=TRUE);
 };
 
 
@@ -511,7 +511,7 @@ public:
 class LLCubeMap;
 
 
-class LLVOSky : public LLViewerObject
+class LLVOSky : public LLStaticViewerObject
 {
 public:
         enum
@@ -593,6 +593,7 @@ public:
         LLColor4 getMoonAmbientColor() const                                    { return mMoonAmbient; }
         const LLColor4& getTotalAmbientColor() const                    { return mTotalAmbient; }
         LLColor4 getFogColor() const                                                    { return mFogColor; }
+        LLColor4 getGLFogColor() const                                                  { return mGLFogCol; }
         
         LLVector3 calcUpVec(const LLVector3 &pos) const
         {
@@ -729,6 +730,8 @@ protected:
         F32                                     sInterpVal;
 
         LLColor4                        mFogColor;
+        LLColor4                        mGLFogCol;
+        
         F32                                     mFogRatio;
         F32                                     mWorldScale;
 
@@ -739,7 +742,7 @@ protected:
         LLColor3                        mMoonDiffuse;
         LLColor4U                       mFadeColor;                                     // Color to fade in from        
 
-        LLCubeMap                       *mCubeMap;                                      // Cube map for the sky
+        LLCubeMap                       *mCubeMap;                                      // Cube map for the environment
         S32                                     mDrawRefl;
 
         LLFrameTimer            mUpdateTimer;