From 6858f007c767ffb2c01d218f9e0288134a7f36c1 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 18 Sep 2018 17:13:27 +0300
Subject: SL-9670 [EEP] 'New Day' is named as 'Default' in the Day Cycle
 editor.

---
 indra/newview/llfloatereditextdaycycle.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llfloatereditextdaycycle.cpp')

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));
 }
 
-- 
cgit v1.2.3


From 89c48daf35ba1499100cdf81e07a91a75eea63c8 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 18 Sep 2018 18:37:18 +0300
Subject: SL-9678 EEP Sometimes not switching inventory based environments

---
 indra/newview/llfloatereditextdaycycle.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloatereditextdaycycle.cpp')

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 3d03409fe9..fa16648140 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -278,8 +278,6 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)
     }
     else
     {
-        mInventoryItem = nullptr;
-        mInventoryId.setNull();
         mCanCopy = true;
         mCanMod = true;
         mMakeNoTrans = false;
@@ -450,6 +448,8 @@ void LLFloaterEditExtDayCycle::setEditDayCycle(const LLSettingsDay::ptr_t &pday)
 
 void LLFloaterEditExtDayCycle::setEditDefaultDayCycle()
 {
+    mInventoryItem = nullptr;
+    mInventoryId.setNull();
     LLSettingsVOBase::getSettingsAsset(LLSettingsDay::GetDefaultAssetId(),
         [this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); });
 }
@@ -1066,6 +1066,13 @@ void LLFloaterEditExtDayCycle::loadInventoryItem(const LLUUID  &inventoryId)
 
 void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status)
 {
+    if ((mInventoryItem && mInventoryItem->getAssetUUID() != asset_id)
+        || (!mInventoryItem && LLSettingsDay::GetDefaultAssetId() != asset_id))
+    {
+        LL_WARNS("ENVDAYEDIT") << "Discarding obsolete asset callback" << LL_ENDL;
+        return;
+    }
+
     if (!settings || status)
     {
         LLSD args;
-- 
cgit v1.2.3