summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.cpp
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/newview/llfloatereditextdaycycle.cpp
parent2a7600fbd2a29cb6ac34767ed82eeef1fa4a1fbe (diff)
MAINT-8952 EEP 'uncompress' day tracks before editing
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 85bcf086e5..84a2e0687f 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -908,7 +908,7 @@ void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::pt
closeFloater();
return;
}
- mEditDay = std::dynamic_pointer_cast<LLSettingsDay>(settings);
+ mEditDay = std::dynamic_pointer_cast<LLSettingsDay>(settings)->buildDeepCloneAndUncompress();
updateEditEnvironment();
LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_INSTANT);
LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
@@ -925,7 +925,7 @@ void LLFloaterEditExtDayCycle::loadLiveEnvironment(LLEnvironment::EnvSelection_t
if (day)
{
- mEditDay = day->buildClone();
+ mEditDay = day->buildDeepCloneAndUncompress();
break;
}
}