Merged in andreykproductengine/maint-eep (pull request #48)

MAINT-8952 EEP 'uncompress' day tracks before editing

2 files changed, 2 insertions, 6 deletions

diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index ea57c8987f..4a99be0c4b 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -366,12 +366,7 @@ bool LLSettingsDay::initialize(bool validate_frames)
                         }
                     }
                 }
-
-                // Build clone since:
-                // - can use settings from "used" multiple times
-                // - settings can reuse LLSDs they were initialized from
-                // - LLSDs are 'smart' and can reuse them self multiple times
-                mDayTracks[i][keyframe] = setting->buildDerivedClone();
+                mDayTracks[i][keyframe] = setting;
             }
         }
     }
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 974ca8660d..0ee5ce3e0b 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -81,6 +81,7 @@ public:
     bool                        initialize(bool validate_frames = false);
 
     virtual ptr_t               buildClone() = 0;
+    virtual ptr_t               buildDeepCloneAndUncompress() = 0;
     virtual LLSD                getSettings() const SETTINGS_OVERRIDE;
     virtual LLSettingsType::type_e  getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_DAYCYCLE; }