Merge and disable new sky render.

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 62a88cde73..06c1e6231e 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -96,6 +96,7 @@ public:
     inline void replaceSettings(LLSD settings)
     {
         mSettings = settings;
+        mBlendedFactor = 0.0;
         setDirtyFlag(true);
     }
 
@@ -146,6 +147,11 @@ public:
         setValue(name, value.getValue());
     }
 
+    inline F64 getBlendFactor() const
+    {
+        return mBlendedFactor;
+    }
+
     // Note this method is marked const but may modify the settings object.
     // (note the internal const cast).  This is so that it may be called without
     // special consideration from getters.
@@ -237,11 +243,19 @@ protected:
 
     LLSD        cloneSettings() const;
 
+    inline void setBlendFactor(F64 blendfactor) 
+    {
+        mBlendedFactor = blendfactor;
+    }
+
+    void markDirty() { mDirty = true; }
+
 private:
     bool        mDirty;
 
     LLSD        combineSDMaps(const LLSD &first, const LLSD &other) const;
 
+    F64         mBlendedFactor;
 };