SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 64350c42e8..327e34d856 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -235,8 +235,12 @@ public:
             TYPE_FIXED,
             TYPE_CYCLED
         };
+
         typedef std::shared_ptr<DayInstance> ptr_t;
 
+        static const U32                NO_ANIMATE_SKY;
+        static const U32                NO_ANIMATE_WATER;
+
                                         DayInstance(EnvSelection_t env);
         virtual                         ~DayInstance() { };
 
@@ -273,7 +277,12 @@ public:
 
         LLSettingsBase::TrackPosition   getProgress() const;
 
+        void                            setFlags(U32 flag) { mAnimateFlags |= flag; }
+        void                            clearFlags(U32 flag) { mAnimateFlags &= ~flag; }
+
     protected:
+
+
         LLSettingsDay::ptr_t        mDayCycle;
         LLSettingsSky::ptr_t        mSky;
         LLSettingsWater::ptr_t      mWater;
@@ -291,6 +300,8 @@ public:
 
         EnvSelection_t              mEnv;
 
+        U32                         mAnimateFlags;
+
         LLSettingsBase::TrackPosition secondsToKeyframe(LLSettingsDay::Seconds seconds);
     };