STORM-1126 WIP Windlight Estate Settings integration: pass 4

Changes:
* Fixed incorrect way to pass parameters to notifications.
* Fixed crashes in the Advanced Sky floater and the Region Terrain panel.
* Fixed initialization and multiple instantiation of the Day Cycle floater
  (that might lead to incorrect behavior).
* Fixed and re-enabled committing env. settings changes to region.
* Fixed day cycle and sky settings being sent as empty arrays and therefore not passing validation on server.
  It is now possible to change region environment settings.
* Added debug messages.

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp
index e863aef94f..733b808ec9 100644
--- a/indra/newview/llfloaterenvsettings.cpp
+++ b/indra/newview/llfloaterenvsettings.cpp
@@ -63,6 +63,7 @@
 
 LLFloaterEnvSettings::LLFloaterEnvSettings(const LLSD &key) : LLFloater(key)
 {	
+	lldebugs << "Creating env settings floater" << llendl;
 }
 
 LLFloaterEnvSettings::~LLFloaterEnvSettings()
@@ -75,6 +76,10 @@ BOOL LLFloaterEnvSettings::postBuild()
 	// load it up
 	initCallbacks();
 	syncMenu();
+
+	LLEnvKey::EScope cur_scope = LLEnvManager::getInstance()->getNormallyDisplayedScope();
+	childSetValue("RegionWLOptIn", cur_scope == LLEnvKey::SCOPE_REGION);
+
 	return TRUE;
 }
 
@@ -258,11 +263,13 @@ void LLFloaterEnvSettings::onChangeWaterColor(LLUICtrl* ctrl, void* userData)
 
 void LLFloaterEnvSettings::onOpenAdvancedSky(void* userData1, void* userData2)
 {
+	// *TODO: make sure title is displayed correctly.
 	LLFloaterReg::showInstance("env_windlight");
 }
 
 void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData1, void* userData2)
 {
+	// *TODO: make sure title is displayed correctly.
 	LLFloaterReg::showInstance("env_water");
 }