From ca5d5be4fb51fa1ee7ffda24a0aa58c71facd7dd Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 11 Jul 2018 16:46:14 -0700
Subject: Minor change from the simulator to throttle the minimum blend in a
 time based blend.

---
 indra/llinventory/llsettingsbase.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/llinventory/llsettingsbase.cpp')

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index f282f0c7dc..8bcf8a4973 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -607,6 +607,8 @@ void LLSettingsBlender::triggerComplete()
 }
 
 //-------------------------------------------------------------------------
+const LLSettingsBase::BlendFactor LLSettingsBlenderTimeDelta::MIN_BLEND_DELTA(0.001);
+
 LLSettingsBase::BlendFactor LLSettingsBlenderTimeDelta::calculateBlend(const LLSettingsBase::TrackPosition& spanpos, const LLSettingsBase::TrackPosition& spanlen) const
 {
     return LLSettingsBase::BlendFactor(fmod((F64)spanpos, (F64)spanlen) / (F64)spanlen);
@@ -629,9 +631,15 @@ void LLSettingsBlenderTimeDelta::applyTimeDelta(const LLSettingsBase::Seconds& t
         return;
     }
 
+    LLSettingsBase::BlendFactor blendf = calculateBlend(mTimeSpent, mBlendSpan);
     mTimeDeltaPassed = LLSettingsBase::Seconds(0.0);
 
-    LLSettingsBase::BlendFactor blendf = calculateBlend(mTimeSpent, mBlendSpan);
+    if (fabs(mLastBlendF - blendf) < mBlendFMinDelta)
+    {
+        return;
+    }
+
+    mLastBlendF = blendf;
 
     update(blendf);
 }
-- 
cgit v1.2.3