STORM-1126 WIP Windlight Estate Settings integration: pass 5

* Added "Apply Local to Region" button to the region terrain setttings panel.
* Fixed previewing presets via a combomox in the Advanced Sky Editor floater.

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 874cc1a030..c09baf1e09 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -1225,6 +1225,7 @@ BOOL LLPanelRegionTerrainInfo::postBuild()
        childSetAction("WLRegionApply", onCommitRegionWL, this);
        childSetAction("WLRegionCancel", onCancelRegionWL, this);
        childSetAction("WLRegionDefault", onSetRegionToDefaultWL, this);
+       childSetAction("WLCurrentApply", onApplyCurrentWL, this);
 
 	return TRUE;
 }
@@ -1469,6 +1470,13 @@ void LLPanelRegionTerrainInfo::onSetRegionToDefaultWL(void* userData)
 	LLEnvManager::instance().startEditingScope(LLEnvKey::SCOPE_REGION);
 }
 
+// static
+void LLPanelRegionTerrainInfo::onApplyCurrentWL(void* userData)
+{
+	// Immediately apply current environment settings to region.
+	LLEnvManager::instance().applyLocalSettingsToRegion();
+}
+
 void LLPanelRegionTerrainInfo::cancelChanges()
 {
 	LLFloaterReg::hideInstance("env_windlight");