SL-9620: Double check that commit actually passes back a day cycle from the editor.

Also hide the altitude setting interface for the moment.

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index 825a38e8b2..d3325796fb 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -205,6 +205,10 @@ void LLPanelEnvironmentInfo::refresh()
    
     udpateApparentTimeOfDay();
 
+#if 1 
+    // hiding the controls until Rider can get the simulator code to adjust altitudes done.
+    getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE);
+#else
     LLEnvironment::altitude_list_t altitudes = LLEnvironment::instance().getRegionAltitudes();
     if (altitudes.size() > 0)
     {
@@ -216,6 +220,7 @@ void LLPanelEnvironmentInfo::refresh()
             mAltitudes[alt_sliders[idx]] = AltitudeData(idx+1, idx, altitudes[idx+1]);
         }
     }
+#endif
 
 }
 
@@ -610,6 +615,11 @@ void LLPanelEnvironmentInfo::onPickerCommited(LLUUID asset_id)
 
 void LLPanelEnvironmentInfo::onEditCommited(LLSettingsDay::ptr_t newday)
 {
+    if (!newday)
+    {
+        LL_WARNS("ENVPANEL") << "Editor committed an empty day. Do nothing." << LL_ENDL;
+        return;
+    }
     size_t newhash(newday->getHash());
     size_t oldhash((mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getHash() : 0);