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.

1 files changed, 0 insertions, 8 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)
     {