Fix the blend code to record the amount of the blend and to store what is being blended towards.

1 files changed, 32 insertions, 3 deletions

diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 1451162744..59a9dc9a43 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -79,6 +79,10 @@ public:
         static const std::string SETTING_DENSITY_PROFILE_CONSTANT_TERM;
         static const std::string SETTING_MIE_ANISOTROPY_FACTOR;
 
+    static const LLUUID DEFAULT_SUN_ID;
+    static const LLUUID DEFAULT_MOON_ID;
+    static const LLUUID DEFAULT_CLOUD_ID;
+
     typedef std::shared_ptr<LLSettingsSky> ptr_t;
     typedef std::pair<F32, F32> azimalt_t;
 
@@ -449,10 +453,31 @@ public:
         return mTotalAmbient;
     }
 
-    virtual validation_list_t getValidationList() const override;
-    static validation_list_t validationList();
+    //=====================================================================
+    virtual void                loadTextures() { };
+
+    //=====================================================================
+    virtual validation_list_t   getValidationList() const override;
+    static validation_list_t    validationList();
+
+    static LLSD                 translateLegacySettings(LLSD legacy);
+
+    //=====================================================================
+    // transient properties used in animations.
+    LLUUID getNextSunTextureId() const
+    {
+        return mNextSunTextureId;
+    }
+
+    LLUUID getNextMoonTextureId() const
+    {
+        return mNextMoonTextureId;
+    }
 
-    static LLSD     translateLegacySettings(LLSD legacy);
+    LLUUID getNextCloudNoiseTextureId() const
+    {
+        return mNextCloudTextureId;
+    }
 
 protected:
     static const std::string SETTING_LEGACY_EAST_ANGLE;
@@ -492,6 +517,10 @@ private:
 
     LLColor4    mTotalAmbient;
 
+    LLUUID      mNextSunTextureId;
+    LLUUID      mNextMoonTextureId;
+    LLUUID      mNextCloudTextureId;
+
     typedef std::map<std::string, S32> mapNameToUniformId_t;
 
     static mapNameToUniformId_t sNameToUniformMapping;