Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.

1 files changed, 1 insertions, 9 deletions

diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
index ec99638740..3f19d89cbb 100644
--- a/indra/newview/llfloaterhardwaresettings.h
+++ b/indra/newview/llfloaterhardwaresettings.h
@@ -42,7 +42,7 @@ class LLFloaterHardwareSettings : public LLFloater
 
 public:
 
-	LLFloaterHardwareSettings();
+	LLFloaterHardwareSettings(const LLSD& key);
 	/*virtual*/ ~LLFloaterHardwareSettings();
 	
 	/*virtual*/ BOOL postBuild();
@@ -50,9 +50,6 @@ public:
 	/// initialize all the callbacks for the menu
 	void initCallbacks(void);
 
-	/// one and one instance only
-	static LLFloaterHardwareSettings* instance();
-	
 	/// callback for the menus help button
 	static void onClickHelp(void* data);
 
@@ -67,9 +64,6 @@ public:
 	/// return if the menu exists or not
 	static bool isOpen();
 
-	/// stuff to do on exit
-	virtual void onClose(bool app_quitting);
-
 	/// sync up menu with parameters
 	void refresh();
 
@@ -92,8 +86,6 @@ protected:
 	BOOL mProbeHardwareOnStartup;
 
 private:
-	// one instance on the inside
-	static LLFloaterHardwareSettings* sHardwareSettings;
 };
 
 #endif