SL-11151, SL-11504

Remove update threshold logic causing hiccups and rework sky updates.

Make deferred water do double transport again to match non-ALM rendering more closely.

2 files changed, 0 insertions, 29 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index c051563714..e8fdd017e3 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -727,22 +727,14 @@ LLSettingsBase::BlendFactor LLSettingsBlenderTimeDelta::calculateBlend(const LLS
 bool LLSettingsBlenderTimeDelta::applyTimeDelta(const LLSettingsBase::Seconds& timedelta)
 {
     mTimeSpent += timedelta;
-    mTimeDeltaPassed += timedelta;
 
     if (mTimeSpent > mBlendSpan)
     {
-        mIgnoreTimeDelta = false;
         triggerComplete();
         return false;
     }
 
-    if ((mTimeDeltaPassed < mTimeDeltaThreshold) && (!mIgnoreTimeDelta))
-    {
-        return false;
-    }
-
     LLSettingsBase::BlendFactor blendf = calculateBlend(mTimeSpent, mBlendSpan);
-    mTimeDeltaPassed = LLSettingsBase::Seconds(0.0);
 
     if (fabs(mLastBlendF - blendf) < mBlendFMinDelta)
     {
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 592ae3478a..afb5014409 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -477,9 +477,6 @@ public:
         mBlendSpan(blend_span),
         mLastUpdate(0.0f),
         mTimeSpent(0.0f),
-        mTimeDeltaThreshold(0.0f),
-        mTimeDeltaPassed(0.0f),
-        mIgnoreTimeDelta(false),
         mBlendFMinDelta(MIN_BLEND_DELTA),
         mLastBlendF(-1.0f)
     {
@@ -499,26 +496,11 @@ public:
         mTimeStart  = LLSettingsBase::Seconds(LLDate::now().secondsSinceEpoch());
         mLastUpdate = mTimeStart;
         mTimeSpent  = LLSettingsBase::Seconds(0.0f);
-        mTimeDeltaPassed = LLSettingsBase::Seconds(0.0f);
         mLastBlendF = LLSettingsBase::BlendFactor(-1.0f);
     }
 
     virtual bool applyTimeDelta(const LLSettingsBase::Seconds& timedelta) SETTINGS_OVERRIDE;
 
-    inline void setTimeDeltaThreshold(const LLSettingsBase::Seconds time)
-    {
-        mTimeDeltaThreshold = time;
-        mTimeDeltaPassed = time + LLSettingsBase::Seconds(1.0);  // take the next update call.
-    }
-
-    inline LLSettingsBase::Seconds getTimeDeltaThreshold() const
-    {
-        return mTimeDeltaThreshold;
-    }
-
-    inline void setIgnoreTimeDeltaThreshold(bool val) { mIgnoreTimeDelta = val; }
-    inline bool getIgnoreTimeDeltaThreshold() const { return mIgnoreTimeDelta; }
-
     inline void setTimeSpent(LLSettingsBase::Seconds time) { mTimeSpent = time; }
 protected:
     LLSettingsBase::BlendFactor calculateBlend(const LLSettingsBase::TrackPosition& spanpos, const LLSettingsBase::TrackPosition& spanlen) const;
@@ -527,9 +509,6 @@ protected:
     LLSettingsBase::Seconds mLastUpdate;
     LLSettingsBase::Seconds mTimeSpent;
     LLSettingsBase::Seconds mTimeStart;
-    LLSettingsBase::Seconds mTimeDeltaThreshold;
-    LLSettingsBase::Seconds mTimeDeltaPassed;
-    bool                    mIgnoreTimeDelta;
     LLSettingsBase::BlendFactor mBlendFMinDelta;
     LLSettingsBase::BlendFactor mLastBlendF;
 };