1 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index dc882141db..85bcf086e5 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -140,6 +140,9 @@ LLFloaterEditExtDayCycle::LLFloaterEditExtDayCycle(const LLSD &key) :
 
     mScratchSky = LLSettingsVOSky::buildDefaultSky();
     mScratchWater = LLSettingsVOWater::buildDefaultWater();
+
+    mEditSky = mScratchSky;
+    mEditWater = mScratchWater;
 }
 
 LLFloaterEditExtDayCycle::~LLFloaterEditExtDayCycle()
@@ -558,7 +561,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
     mTimeSlider->setCurSliderValue(sliderpos);
 
     updateTabs();
-    LLEnvironment::instance().updateEnvironment();
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
 }
 
 void LLFloaterEditExtDayCycle::onFrameSliderDoubleClick(S32 x, S32 y, MASK mask)
@@ -908,7 +911,7 @@ void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::pt
     mEditDay = std::dynamic_pointer_cast<LLSettingsDay>(settings);
     updateEditEnvironment();
     LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_INSTANT);
-    LLEnvironment::instance().updateEnvironment();
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
     synchronizeTabs();
     updateTabs();
     refresh();
@@ -935,7 +938,7 @@ void LLFloaterEditExtDayCycle::loadLiveEnvironment(LLEnvironment::EnvSelection_t
 
     updateEditEnvironment();
     LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_INSTANT);
-    LLEnvironment::instance().updateEnvironment();
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
     synchronizeTabs();
     updateTabs();
     refresh();
@@ -960,7 +963,8 @@ void LLFloaterEditExtDayCycle::updateEditEnvironment(void)
 
     reblendSettings();
 
-    LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, mScratchSky, mScratchWater);
+    LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, mEditSky, mEditWater);
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
 }
 
 void LLFloaterEditExtDayCycle::synchronizeTabs()
@@ -993,6 +997,7 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
     {
         psettingW = mScratchWater;
     }
+    mEditWater = psettingW;
 
     setTabsData(tabs, psettingW, canedit);
 
@@ -1021,11 +1026,13 @@ void LLFloaterEditExtDayCycle::synchronizeTabs()
     {
         psettingS = mScratchSky;
     }
+    mEditSky = psettingS;
 
     doCloseInventoryFloater();
 
     setTabsData(tabs, psettingS, canedit);
-    LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, psettingS, psettingW);
+    LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, mEditSky, mEditWater);
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
 }
 
 void LLFloaterEditExtDayCycle::setTabsData(LLTabContainer * tabcontainer, const LLSettingsBase::ptr_t &settings, bool editable)