Merge with tip

1 files changed, 9 insertions, 3 deletions

diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
index aed6b00517..b72e3d855d 100644
--- a/indra/newview/llfloatermediasettings.h
+++ b/indra/newview/llfloatermediasettings.h
@@ -54,11 +54,13 @@ public:
 	static void apply();
 	static void initValues( const LLSD& media_settings , bool editable);
 	static void clearValues( bool editable);
-	void enableOkApplyBtns( bool enable );
-	LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;};
-	const std::string getHomeUrl();
+
+	LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;};	
+	const std::string getHomeUrl();	
 	//bool passesWhiteList( const std::string& test_url );
 
+	virtual void	draw();
+
 	bool mIdenticalHasMediaInfo;
 	bool mMultipleMedia;
 	bool mMultipleValidMedia;
@@ -82,6 +84,10 @@ protected:
 	static LLFloaterMediaSettings* sInstance;
 
 private:
+
+	void enableOkApplyBtns( bool enable );
+	
+	LLSD mInitialValues;
 	bool mWaitingToClose;
 };