Merge

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 64773e4b59..165971b943 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()
@@ -203,7 +206,7 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)
     }
     else
     {
-        loadLiveEnvironment(LLEnvironment::ENV_DEFAULT);
+        loadLiveEnvironment(env);
     }
 
     mDayLength.value(0);
@@ -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)