summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-09-18 17:13:27 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-09-18 17:13:27 +0300
commit6858f007c767ffb2c01d218f9e0288134a7f36c1 (patch)
tree87218a9252bfdee0ae54b7b1ef77f9e9c67f071b /indra/newview
parentfb0212b85305638d50fe1309b8d3174ae57b0543 (diff)
SL-9670 [EEP] 'New Day' is named as 'Default' in the Day Cycle editor.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 4be0e30c62..3d03409fe9 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1085,6 +1085,9 @@ void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::pt
else
settings->setFlag(LLSettingsBase::FLAG_NOMOD);
+ if (mInventoryItem)
+ settings->setName(mInventoryItem->getName());
+
setEditDayCycle(std::dynamic_pointer_cast<LLSettingsDay>(settings));
}