1 files changed, 10 insertions, 84 deletions

diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index c9d0e51640..e4687fff0c 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -34,8 +34,8 @@
 #include "llhost.h"
 #include "llpanel.h"
 #include "llextendedstatus.h"
+#include "llpanelenvironment.h"
 
-#include "llenvmanager.h" // for LLEnvironmentSettings
 #include "lleventcoro.h"
 
 class LLAvatarName;
@@ -64,13 +64,9 @@ class LLPanelEstateCovenant;
 class LLPanelExperienceListEditor;
 class LLPanelExperiences;
 class LLPanelRegionExperiences;
+class LLPanelRegionEnvironment;
 
 class LLEventTimer;
-class LLEnvironmentSettings;
-class LLWLParamManager;
-class LLWaterParamManager;
-class LLWLParamSet;
-class LLWaterParamSet;
 
 class LLFloaterRegionInfo : public LLFloater
 {
@@ -81,13 +77,9 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ BOOL postBuild();
 
-	static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
-
 	// get and process region info if necessary.
 	static void processRegionInfo(LLMessageSystem* msg);
 
-	static const LLUUID& getLastInvoice() { return sRequestInvoice; }
-	static void nextInvoice() { sRequestInvoice.generate(); }
 	//static S32 getSerial() { return sRequestSerial; }
 	//static void incrementSerial() { sRequestSerial++; }
 
@@ -100,6 +92,7 @@ public:
 	// from LLPanel
 	virtual void refresh();
 	
+	void onRegionChanged();
 	void requestRegionInfo();
 	void requestMeshRezInfo();
 	void enableTopButtons();
@@ -121,8 +114,10 @@ protected:
 	LLTabContainer* mTab;
 	typedef std::vector<LLPanelRegionInfo*> info_panels_t;
 	info_panels_t mInfoPanels;
-	//static S32 sRequestSerial;	// serial # of last EstateOwnerRequest
-	static LLUUID sRequestInvoice;
+    LLPanelRegionEnvironment *mEnvironmentPanel;
+
+private:
+    boost::signals2::connection mRegionChangedCallback;
 };
 
 
@@ -157,14 +152,6 @@ protected:
 	
 	typedef std::vector<std::string> strings_t;
 	//typedef std::vector<U32> integers_t;
-	void sendEstateOwnerMessage(
-					 LLMessageSystem* msg,
-					 const std::string& request,
-					 const LLUUID& invoice,
-					 const strings_t& strings);
-	
-	// member data
-	LLHost mHost;
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -266,12 +253,9 @@ private:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-
 class LLPanelEstateInfo : public LLPanelRegionInfo
 {
 public:
-	static void initDispatch(LLDispatcher& dispatch);
-	
 	void onChangeFixedSun();
 	void onChangeUseGlobalTime();
 	void onChangeAccessOverride();
@@ -331,6 +315,7 @@ public:
 	virtual void refresh();
 
 	void refreshFromEstate();
+    void refreshAccessFromEstate(U32 flags);
 	
 	static bool isLindenEstate();
 	
@@ -415,69 +400,10 @@ protected:
 
 /////////////////////////////////////////////////////////////////////////////
 
-class LLPanelEnvironmentInfo : public LLPanelRegionInfo
-{
-	LOG_CLASS(LLPanelEnvironmentInfo);
-
-public:
-	LLPanelEnvironmentInfo();
-
-	// LLPanel
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-
-	// LLView
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
-
-	// LLPanelRegionInfo
-	/*virtual*/ bool refreshFromRegion(LLViewerRegion* region);
-
-private:
-	void refresh();
-	void setControlsEnabled(bool enabled);
-	void setApplyProgress(bool started);
-	void setDirty(bool dirty);
-
-	void sendRegionSunUpdate();
-	void fixEstateSun();
-
-	void populateWaterPresetsList();
-	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 onSelectWaterPreset();
-	void onSelectSkyPreset();
-	void onSelectDayCycle();
-
-	void onBtnApply();
-	void onBtnCancel();
-
-	void onRegionSettingschange();
-	void onRegionSettingsApplied(bool ok);
-
-	/// New environment settings that are being applied to the region.
-	LLEnvironmentSettings	mNewRegionSettings;
-
-	bool			mEnableEditing;
-
-	LLRadioGroup*	mRegionSettingsRadioGroup;
-	LLRadioGroup*	mDayCycleSettingsRadioGroup;
-
-	LLComboBox*		mWaterPresetCombo;
-	LLComboBox*		mSkyPresetCombo;
-	LLComboBox*		mDayCyclePresetCombo;
-};
 
 class LLPanelRegionExperiences : public LLPanelRegionInfo
 {
-	LOG_CLASS(LLPanelEnvironmentInfo);
+    LOG_CLASS(LLPanelRegionExperiences);
 
 public:
 	LLPanelRegionExperiences(){}
@@ -492,7 +418,7 @@ public:
 	void sendPurchaseRequest()const;
 	void processResponse( const LLSD& content );
 private:
-	void refreshRegionExperiences();
+    void refreshExperiencesFromEstate();
 
     static std::string regionCapabilityQuery(LLViewerRegion* region, const std::string &cap);