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

1 files changed, 4 insertions, 13 deletions

diff --git a/indra/newview/llfloaterscriptdebug.h b/indra/newview/llfloaterscriptdebug.h
index 5f2cf48125..ffc60e5554 100644
--- a/indra/newview/llfloaterscriptdebug.h
+++ b/indra/newview/llfloaterscriptdebug.h
@@ -41,15 +41,13 @@ class LLUUID;
 class LLFloaterScriptDebug : public LLMultiFloater
 {
 public:
+	LLFloaterScriptDebug(const LLSD& key);
 	virtual ~LLFloaterScriptDebug();
-	virtual void onClose(bool app_quitting) { setVisible(FALSE); }
 	virtual BOOL postBuild();
     static void show(const LLUUID& object_id);
 	static void addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id);
 
 protected:
-	LLFloaterScriptDebug(const std::string& filename);
-
 	static LLFloater* addOutputWindow(const LLUUID& object_id);
 
 protected:
@@ -59,24 +57,17 @@ protected:
 class LLFloaterScriptDebugOutput : public LLFloater
 {
 public:
-	LLFloaterScriptDebugOutput();
-	LLFloaterScriptDebugOutput(const LLUUID& object_id);
+	LLFloaterScriptDebugOutput(const LLSD& object_id);
 	~LLFloaterScriptDebugOutput();
 
 	void addLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color);
 
 	virtual BOOL postBuild();
 	
-	static LLFloaterScriptDebugOutput* show(const LLUUID& object_id);
-	static LLFloaterScriptDebugOutput* getFloaterByID(const LLUUID& id);
-
 protected:
-	LLTextEditor*			mHistoryEditor;
-
-	typedef std::map<LLUUID, LLFloaterScriptDebugOutput*> instance_map_t;
-	static instance_map_t sInstanceMap;
+	LLTextEditor* mHistoryEditor;
 
-	LLUUID		mObjectID;
+	LLUUID mObjectID;
 };
 
 #endif // LL_LLFLOATERSCRIPTDEBUG_H