summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r--indra/newview/llfloaterregioninfo.cpp8
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");