Merge

1 files changed, 29 insertions, 1 deletions

diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index 51b2fa380f..3edfd4156c 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -141,6 +141,7 @@ void LLPanelEnvironmentInfo::refresh()
         return;
 
     setControlsEnabled(canEdit());
+
     if (!mCurrentEnvironment)
     {
         return;
@@ -240,6 +241,7 @@ LLFloaterEditExtDayCycle * LLPanelEnvironmentInfo::getEditFloater(bool create)
 
         if (!editor)
             return nullptr;
+        mEditFloater = editor->getHandle();
     }
 
     if (editor && !mCommitConnection.connected())
@@ -248,6 +250,30 @@ LLFloaterEditExtDayCycle * LLPanelEnvironmentInfo::getEditFloater(bool create)
     return editor;
 }
 
+
+void LLPanelEnvironmentInfo::updateEditFloater(const LLEnvironment::EnvironmentInfo::ptr_t &nextenv)
+{
+    LLFloaterEditExtDayCycle *dayeditor(getEditFloater(false));
+
+    if (!dayeditor)
+        return;
+
+    if (!nextenv || !nextenv->mDayCycle)
+    {
+        if (mCommitConnection.connected())
+            mCommitConnection.disconnect();
+
+        if (dayeditor->isDirty())
+            dayeditor->refresh();
+        else
+            dayeditor->closeFloater();
+    }
+    else
+    {
+        /*TODO: Swap in new day to edit?*/
+    }
+}
+
 void LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
 {
     S32 rdo_selection = getChild<LLRadioGroup>(RDG_ENVIRONMENT_SELECT)->getSelectedIndex();
@@ -272,6 +298,7 @@ void LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
     getChild<LLUICtrl>(PNL_BUTTONS)->setVisible(!is_unavailable);
     getChild<LLUICtrl>(PNL_DISABLED)->setVisible(is_unavailable);
 
+    updateEditFloater(mCurrentEnvironment);
 }
 
 void LLPanelEnvironmentInfo::setApplyProgress(bool started)
@@ -357,7 +384,8 @@ void LLPanelEnvironmentInfo::onBtnEdit()
     LLFloaterEditExtDayCycle *dayeditor = getEditFloater();
 
     LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, (mCurrentParcelId == INVALID_PARCEL_ID) ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION)
-        (LLFloaterEditExtDayCycle::KEY_DAY_LENGTH, mCurrentEnvironment ? (S32)(mCurrentEnvironment->mDayLength.value()) : FOURHOURS));
+            (LLFloaterEditExtDayCycle::KEY_DAY_LENGTH,  mCurrentEnvironment ? (S32)(mCurrentEnvironment->mDayLength.value()) : FOURHOURS)
+            (LLFloaterEditExtDayCycle::KEY_CANMOD,      LLSD::Boolean(true)));
 
     dayeditor->openFloater(params);
     if (mCurrentEnvironment->mDayCycle)