1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index cbdc026cfe..5a13b3b029 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -205,7 +205,7 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)
     }
     else
     {
-        loadLiveEnvironment(env);
+        loadLiveEnvironment(LLEnvironment::ENV_DEFAULT);
     }
 
     mDayLength.value(0);
@@ -708,6 +708,11 @@ void LLFloaterEditExtDayCycle::updateSkyTabs(const LLSettingsSkyPtr_t &p_sky)
     {
         panel->setSky(p_sky);
     }
+    panel = dynamic_cast<LLPanelSettingsDensityTab*>(tab_container->getChildView("advanced_atmo_panel"));
+    if (panel)
+    {
+        panel->setSky(p_sky);
+    }
 }
 
 void LLFloaterEditExtDayCycle::setWaterTabsEnabled(BOOL enable)
@@ -744,6 +749,12 @@ void LLFloaterEditExtDayCycle::setSkyTabsEnabled(BOOL enable)
         panel->setEnabled(enable);
         panel->setAllChildrenEnabled(enable);
     }
+    panel = dynamic_cast<LLPanelSettingsDensityTab*>(tab_container->getChildView("advanced_atmo_panel"));
+    if (panel)
+    {
+        panel->setEnabled(enable);
+        panel->setAllChildrenEnabled(enable);
+    }
 }
 
 void LLFloaterEditExtDayCycle::updateButtons()