summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-08-15 18:31:07 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-08-15 18:31:07 +0300
commit584fec695bc8d6bafc38ff6ed3b435f133fdca2b (patch)
treeb0b465c2e21bd76442037081ed8f38b6d5ae99d9 /indra/llinventory
parent2a7600fbd2a29cb6ac34767ed82eeef1fa4a1fbe (diff)
MAINT-8952 EEP 'uncompress' day tracks before editing
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingsdaycycle.cpp7
-rw-r--r--indra/llinventory/llsettingsdaycycle.h1
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; }