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

1 files changed, 1 insertions, 21 deletions

diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index 67d2f0ceec..0be440d92b 100644
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -49,22 +49,11 @@ class LLFloaterTOS :
 	public LLWebBrowserCtrlObserver
 {
 public:
+	LLFloaterTOS(const LLSD& message);
 	virtual ~LLFloaterTOS();
 
-	// Types of dialog.
-	enum ETOSType
-	{
-		TOS_TOS = 0,
-		TOS_CRITICAL_MESSAGE = 1
-	};
-
 	typedef boost::function<void(bool)> YesNoCallback;
 
-	// Asset_id is overwritten with LLUUID::null when agree is clicked.
-	static LLFloaterTOS* show(ETOSType type, 
-							  const std::string & message, 
-							  const YesNoCallback& callback);
-
 	BOOL postBuild();
 	
 	virtual void draw();
@@ -78,19 +67,10 @@ public:
 	virtual void onNavigateComplete( const EventType& eventIn );
 
 private:
-	// Asset_id is overwritten with LLUUID::null when agree is clicked.
-	LLFloaterTOS(ETOSType type, 
-				 const std::string & message, 
-				 const YesNoCallback& callback);
-
-private:
-	ETOSType		mType;
 	std::string		mMessage;
 	int				mWebBrowserWindowId;
 	int				mLoadCompleteCount;
 	YesNoCallback	mCallback;
-
-	static LLFloaterTOS* sInstance;
 };
 
 #endif // LL_LLFLOATERTOS_H