Merged in andreykproductengine/maint-eep (pull request #99)

SL-9679 EEP - disable panel elements until data update, null cycle crash fix

3 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 453c9f1138..3d3f5e8cfa 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -3340,8 +3340,8 @@ void LLPanelLandEnvironment::refreshFromSource()
         setCrossRegion(true);
         mCurrentEnvironment.reset();
         mLastParcelId = INVALID_PARCEL_ID;
-        setControlsEnabled(false);
     }
+    setControlsEnabled(false);
 }
 
 
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 96ca7c1ac4..c8ed43871d 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -3451,6 +3451,8 @@ void LLPanelRegionEnvironment::refreshFromSource()
 
     LLEnvironment::instance().requestRegion(
         [that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { _onEnvironmentReceived(that_h, parcel_id, envifo); });
+
+    setControlsEnabled(false);
 }
 
 void LLPanelRegionEnvironment::doApply()
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index ecffa34ab9..bc06bde138 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -550,7 +550,7 @@ void LLPanelEnvironmentInfo::onBtnEdit()
             (LLFloaterEditExtDayCycle::KEY_CANMOD,      LLSD::Boolean(true)));
 
     dayeditor->openFloater(params);
-    if (mCurrentEnvironment->mDayCycle)
+    if (mCurrentEnvironment && mCurrentEnvironment->mDayCycle)
         dayeditor->setEditDayCycle(mCurrentEnvironment->mDayCycle);
     else
         dayeditor->setEditDefaultDayCycle();
@@ -562,7 +562,7 @@ void LLPanelEnvironmentInfo::onBtnSelect()
     if (picker)
     {
         picker->setSettingsFilter(LLSettingsType::ST_NONE);
-        picker->setSettingsAssetId((mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null);
+        picker->setSettingsAssetId((mCurrentEnvironment && mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null);
         picker->openFloater();
         picker->setFocus(TRUE);
     }