STORM-1279 FIXED Changing sky preset with a keyboard shortcut now updates the Environment Settings floater.

Changes:
* Subscribed the floater to the "settings changed" signal of the environment manager.
* Rewrote the floater to not modify settings only when the Save button is pressed.
* Refactoring to eliminate code duplication.

1 files changed, 2 insertions, 9 deletions

diff --git a/indra/newview/llfloaterenvironmentsettings.h b/indra/newview/llfloaterenvironmentsettings.h
index 0953ab4a65..0ab458a0f6 100644
--- a/indra/newview/llfloaterenvironmentsettings.h
+++ b/indra/newview/llfloaterenvironmentsettings.h
@@ -38,7 +38,6 @@ class LLFloaterEnvironmentSettings : public LLFloater
 
 public:
 	LLFloaterEnvironmentSettings(const LLSD &key);
-	/*virtual*/ ~LLFloaterEnvironmentSettings();
 	/*virtual*/	BOOL	postBuild();	
 	/*virtual*/ void	onOpen(const LLSD& key);
 
@@ -53,6 +52,8 @@ private:
 	void onBtnOK();
 	void onBtnCancel();
 
+	void refresh(); /// update controls with user prefs
+	void apply();
 	void cancel();
 
 	void populateWaterPresetsList();
@@ -65,14 +66,6 @@ private:
 	LLComboBox*		mWaterPresetCombo;
 	LLComboBox*		mSkyPresetCombo;
 	LLComboBox*		mDayCyclePresetCombo;
-
-	std::string 	mWaterPreset;
-	std::string 	mSkyPreset;
-	std::string 	mDayCyclePreset;
-
-	bool 			mUseRegionSettings;
-	bool 			mUseFixedSky;
-	bool			mDirty;
 };
 
 #endif // LL_LLFLOATERENVIRONMENTSETTINGS_H