SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions.

1 files changed, 30 insertions, 21 deletions

diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 6a930959bb..64350c42e8 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -197,6 +197,10 @@ public:
     // Construct a new day cycle based on the environment.  Replacing either the water or the sky tracks.
     LLSettingsDay::ptr_t        createDayCycleFromEnvironment(EnvSelection_t env, LLSettingsBase::ptr_t settings);
 
+    F32                         getProgress() const                         { return (mCurrentEnvironment) ? mCurrentEnvironment->getProgress() : -1.0f; }
+    F32                         getRegionProgress() const                   { return (mEnvironments[ENV_REGION]) ? mEnvironments[ENV_REGION]->getProgress() : -1.0f; }
+    void                        adjustRegionOffset(F32 adjust);     // only used on legacy regions, to better sync the viewer with other agents
+
     //-------------------------------------------
     connection_t                setEnvironmentChanged(env_changed_fn cb)    { return mSignalEnvChanged.connect(cb); }
 
@@ -233,37 +237,42 @@ public:
         };
         typedef std::shared_ptr<DayInstance> ptr_t;
 
-                                    DayInstance(EnvSelection_t env);
-        virtual                     ~DayInstance() { };
+                                        DayInstance(EnvSelection_t env);
+        virtual                         ~DayInstance() { };
+
+        virtual ptr_t                   clone() const;
+
+        virtual bool                    applyTimeDelta(const LLSettingsBase::Seconds& delta);
+
+        virtual void                    setDay(const LLSettingsDay::ptr_t &pday, LLSettingsDay::Seconds daylength, LLSettingsDay::Seconds dayoffset);
+        virtual void                    setSky(const LLSettingsSky::ptr_t &psky);
+        virtual void                    setWater(const LLSettingsWater::ptr_t &pwater);
 
-        virtual ptr_t               clone() const;
+        void                            initialize();
+        bool                            isInitialized();
 
-        virtual bool                applyTimeDelta(const LLSettingsBase::Seconds& delta);
+        void                            clear();
 
-        virtual void                setDay(const LLSettingsDay::ptr_t &pday, LLSettingsDay::Seconds daylength, LLSettingsDay::Seconds dayoffset);
-        virtual void                setSky(const LLSettingsSky::ptr_t &psky);
-        virtual void                setWater(const LLSettingsWater::ptr_t &pwater);
+        void                            setSkyTrack(S32 trackno);
 
-        void                        initialize();
-        bool                        isInitialized();
+        LLSettingsDay::ptr_t            getDayCycle() const     { return mDayCycle; }
+        LLSettingsSky::ptr_t            getSky() const          { return mSky; }
+        LLSettingsWater::ptr_t          getWater() const        { return mWater; }
+        LLSettingsDay::Seconds          getDayLength() const    { return mDayLength; }
+        LLSettingsDay::Seconds          getDayOffset() const    { return mDayOffset; }
+        S32                             getSkyTrack() const     { return mSkyTrack; }
 
-        void                        clear();
+        void                            setDayOffset(LLSettingsBase::Seconds offset) { mDayOffset = offset; animate(); }
 
-        void                        setSkyTrack(S32 trackno);
+        virtual void                    animate();
 
-        LLSettingsDay::ptr_t        getDayCycle() const     { return mDayCycle; }
-        LLSettingsSky::ptr_t        getSky() const          { return mSky; }
-        LLSettingsWater::ptr_t      getWater() const        { return mWater; }
-        LLSettingsDay::Seconds      getDayLength() const    { return mDayLength; }
-        LLSettingsDay::Seconds      getDayOffset() const    { return mDayOffset; }
-        S32                         getSkyTrack() const     { return mSkyTrack; }
+        void                            setBlenders(const LLSettingsBlender::ptr_t &skyblend, const LLSettingsBlender::ptr_t &waterblend);
 
-        virtual void                animate();
+        EnvSelection_t                  getEnvironmentSelection() const { return mEnv; }
+        void                            setEnvironmentSelection(EnvSelection_t env) { mEnv = env; }
 
-        void                        setBlenders(const LLSettingsBlender::ptr_t &skyblend, const LLSettingsBlender::ptr_t &waterblend);
+        LLSettingsBase::TrackPosition   getProgress() const;
 
-        EnvSelection_t              getEnvironmentSelection() const { return mEnv; }
-        void                        setEnvironmentSelection(EnvSelection_t env) { mEnv = env; }
     protected:
         LLSettingsDay::ptr_t        mDayCycle;
         LLSettingsSky::ptr_t        mSky;