From 430c5cd23558ba42c7da0e31845a3677e66f1fed Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 17 May 2018 16:16:33 -0700
Subject: Self contained looping track blender.  Will blend over time across an
 entire track in a day cycle.

---
 indra/llinventory/llsettingsbase.h     | 6 +++---
 indra/llinventory/llsettingsdaycycle.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index d304638d20..6ab3032a3d 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -271,7 +271,8 @@ public:
         mInitial(initsetting),
         mFinal(endsetting)
     {
-        mTarget->replaceSettings(mInitial->getSettings());
+        if (mInitial)
+            mTarget->replaceSettings(mInitial->getSettings());
     }
 
     virtual ~LLSettingsBlender() {}
@@ -309,7 +310,6 @@ public:
 protected:
     void                    triggerComplete();
 
-private:
     finish_signal_t         mOnFinished;
 
     LLSettingsBase::ptr_t   mTarget;
@@ -347,7 +347,7 @@ public:
 
     virtual void            update(F64 timedelta) override;
 
-private:
+protected:
     F64Seconds              mBlendSpan;
     F64Seconds              mLastUpdate;
     F64Seconds              mTimeSpent;
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index a869d4970c..15a5b29f9f 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -60,7 +60,7 @@ public:
 
     typedef std::map<F32, LLSettingsBase::ptr_t>    CycleTrack_t;
     typedef std::vector<CycleTrack_t>               CycleList_t;
-    typedef std::shared_ptr<LLSettingsDay>        ptr_t;
+    typedef std::shared_ptr<LLSettingsDay>          ptr_t;
     typedef std::vector<F32>                        KeyframeList_t;
     typedef std::pair<CycleTrack_t::iterator, CycleTrack_t::iterator> TrackBound_t;
 
-- 
cgit v1.2.3