From c0037909d576fc4922b92dfcc83d865d61ac43cb Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 26 May 2011 19:32:20 +0300
Subject: STORM-1284 FIXED Changes to region environment are now visible
 immediately.

Pressing "Apply" sends the settings update to server.
Pressing "Cancel" reverts to current region settings.
---
 indra/newview/llfloaterregioninfo.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterregioninfo.h')

diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index d96ab1339f..713afae1f6 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -433,6 +433,9 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void onOpen(const LLSD& key);
 
+	// LLView
+	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
+
 	// LLPanelRegionInfo
 	/*virtual*/ bool refreshFromRegion(LLViewerRegion* region);
 
@@ -445,10 +448,18 @@ private:
 	void populateSkyPresetsList();
 	void populateDayCyclesList();
 
+	bool getSelectedWaterParams(LLSD& water_params);
+	bool getSelectedSkyParams(LLSD& sky_params, std::string& preset_name);
+	bool getSelectedDayCycleParams(LLSD& day_cycle, LLSD& sky_map, short& scope);
+
 	void onSwitchRegionSettings();
 	void onSwitchDayCycle();
 
-	void onBtnSave();
+	void onSelectWaterPreset();
+	void onSelectSkyPreset();
+	void onSelectDayCycle();
+
+	void onBtnApply();
 	void onBtnCancel();
 
 	void onRegionSettingschange();
-- 
cgit v1.2.3