switch track based on altitudes sent from region.

2 files changed, 2 insertions, 6 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 411eaff8e3..d8e337e231 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -548,7 +548,7 @@ F64 LLSettingsBlender::setPosition(F64 blendf)
     blendf = llclamp(blendf, 0.0, 1.0);
 
     mTarget->replaceSettings(mInitial->getSettings());
-    if (mIsTrivial || (blendf == 0.0))
+    if (!mFinal || (mInitial == mFinal) || (blendf == 0.0))
     {   // this is a trivial blend.  Results will be identical to the initial.
         return blendf;
     }
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 71358d6a49..1ef7df79ad 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -271,15 +271,13 @@ public:
         mOnFinished(),
         mTarget(target),
         mInitial(initsetting),
-        mFinal(endsetting),
-        mIsTrivial(false)
+        mFinal(endsetting)
     {
         if (mInitial)
             mTarget->replaceSettings(mInitial->getSettings());
 
         if (!mFinal)
             mFinal = mInitial;
-        mIsTrivial = (mFinal == mInitial);
     }
 
     virtual ~LLSettingsBlender() {}
@@ -295,7 +293,6 @@ public:
 
         if (!mFinal)
             mFinal = mInitial;
-        mIsTrivial = (mFinal == mInitial);
 
         mTarget->replaceSettings(mInitial->getSettings());
     }
@@ -333,7 +330,6 @@ protected:
     LLSettingsBase::ptr_t   mTarget;
     LLSettingsBase::ptr_t   mInitial;
     LLSettingsBase::ptr_t   mFinal;
-    bool                    mIsTrivial;
 };
 
 class LLSettingsBlenderTimeDelta : public LLSettingsBlender