1 files changed, 10 insertions, 74 deletions

diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h
index 590be08169..22ce167244 100644
--- a/indra/newview/llfloaterfixedenvironment.h
+++ b/indra/newview/llfloaterfixedenvironment.h
@@ -29,6 +29,7 @@
 
 #include "llfloater.h"
 #include "llsettingsbase.h"
+#include "llflyoutcombobtn.h"
 
 class LLTabContainer;
 class LLButton;
@@ -43,6 +44,7 @@ class LLFloaterFixedEnvironment : public LLFloater
 
 public:
                             LLFloaterFixedEnvironment(const LLSD &key);
+                            ~LLFloaterFixedEnvironment();
 
     virtual BOOL	        postBuild()         override;
 
@@ -65,88 +67,24 @@ protected:
 
     virtual void            doLoadFromInventory() = 0;
     virtual void            doImportFromDisk() = 0;
-    virtual void            doApplyFixedSettings() = 0;
+    virtual void            doApplyCreateNewInventory();
+    virtual void            doApplyUpdateInventory();
+    virtual void            doApplyEnvironment(const std::string &where);
 
     bool                    canUseInventory() const;
+    bool                    canApplyRegion() const;
+    bool                    canApplyParcel() const;
+
+    LLFlyoutComboBtn *      mFlyoutControl;
 
 private:
     void                    onNameChanged(const std::string &name);
 
     void                    onButtonLoad();
     void                    onButtonImport();
-    void                    onButtonApply();
+    void                    onButtonApply(LLUICtrl *ctrl, const LLSD &data);
     void                    onButtonCancel();
 
-#if 0
-
-	/*virtual*/	BOOL	postBuild();
-	/*virtual*/ void	onOpen(const LLSD& key);
-	/*virtual*/ void	onClose(bool app_quitting);
-	/*virtual*/ void	draw();
-
-
-	//-- WL stuff begins ------------------------------------------------------
-
-	void syncControls(); /// sync up sliders with parameters
-
-	void setColorSwatch(const std::string& name, const WLColorControl& from_ctrl, F32 k);
-
-	// general purpose callbacks for dealing with color controllers
-	void onColorControlMoved(LLUICtrl* ctrl, WLColorControl* color_ctrl);
-	void onColorControlRMoved(LLUICtrl* ctrl, void* userdata);
-	void onColorControlGMoved(LLUICtrl* ctrl, void* userdata);
-	void onColorControlBMoved(LLUICtrl* ctrl, void* userdata);
-	void onFloatControlMoved(LLUICtrl* ctrl, void* userdata);
-
-    void adjustIntensity(WLColorControl *ctrl, F32 color, F32 scale);
-
-	// lighting callbacks for glow
-	void onGlowRMoved(LLUICtrl* ctrl, void* userdata);
-	void onGlowBMoved(LLUICtrl* ctrl, void* userdata);
-
-	// lighting callbacks for sun
-	void onSunMoved(LLUICtrl* ctrl, void* userdata);
-	void onTimeChanged();
-
-    void onSunRotationChanged();
-    void onMoonRotationChanged();
-
-	// for handling when the star slider is moved to adjust the alpha
-	void onStarAlphaMoved(LLUICtrl* ctrl);
-
-	// handle cloud scrolling
-	void onCloudScrollXMoved(LLUICtrl* ctrl);
-	void onCloudScrollYMoved(LLUICtrl* ctrl);
-
-	//-- WL stuff ends --------------------------------------------------------
-
-	void reset(); /// reset the floater to its initial state
-	bool isNewPreset() const;
-	void refreshSkyPresetsList();
-	void enableEditing(bool enable);
-	void saveRegionSky();
-	std::string getSelectedPresetName() const;
-
-	void onSkyPresetNameEdited();
-	void onSkyPresetSelected();
-	bool onSaveAnswer(const LLSD& notification, const LLSD& response);
-	void onSaveConfirmed();
-
-	void onBtnSave();
-	void onBtnCancel();
-
-	void onSkyPresetListChange();
-	void onRegionSettingsChange();
-	void onRegionInfoUpdate();
-
-    LLSettingsSky::ptr_t mEditSettings;
-
-	LLLineEditor*	mSkyPresetNameEditor;
-	LLComboBox*		mSkyPresetCombo;
-	LLCheckBoxCtrl*	mMakeDefaultCheckBox;
-	LLButton*		mSaveButton;
-    LLSkySettingsAdapterPtr mSkyAdapter;
-#endif
 };
 
 class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment
@@ -166,7 +104,6 @@ protected:
 
     virtual void            doLoadFromInventory()       override;
     virtual void            doImportFromDisk()          override;
-    virtual void            doApplyFixedSettings()      override;
 
 private:
 };
@@ -188,7 +125,6 @@ protected:
 
     virtual void            doLoadFromInventory()       override;
     virtual void            doImportFromDisk()          override;
-    virtual void            doApplyFixedSettings()      override;
 
 private:
 };