1 files changed, 18 insertions, 21 deletions

diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index b5393866b8..6ba3165d6a 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -40,41 +40,41 @@
 
 #include "llfloater.h"
 #include "lllogchat.h"
-class LLButton;
+
 class LLChat;
-class LLComboBox;
-class LLLineEditor;
-class LLViewerTextEditor;
-class LLMessageSystem;
-class LLUUID;
-class LLCheckBoxCtrl;
 class LLPanelActiveSpeakers;
 class LLLogChat;
 
-class LLFloaterChat
-	:	public LLFloater, public LLUISingleton<LLFloaterChat, LLFloaterChat>
+enum ELogOptions
+{
+	LOG_CHAT = 0,
+	LOG_IM = 1,
+	LOG_BOTH_TOGETHER = 2,
+	LOG_BOTH_SEPARATE = 3
+};
+
+class LLFloaterChat : public LLFloater
 {
 public:
 	LLFloaterChat(const LLSD& seed);
 	~LLFloaterChat();
 
-	virtual void setVisible( BOOL b );
 	virtual void draw();
 	virtual BOOL postBuild();
-	virtual void onClose(bool app_quitting);
-	virtual void onVisibilityChange(BOOL cur_visibility);
-	virtual void setMinimized(BOOL);
+
 	void updateConsoleVisibility();
 
 	static void setHistoryCursorAndScrollToEnd();
-	
+
+	//  *TODO:Skinning - move these to LLChat (or LLViewerChat?)
 	// Add chat to console and history list.
 	// Color based on source, type, distance.
 	static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);
-	
 	// Add chat to history alone.
 	static void addChatHistory(const LLChat& chat, bool log_to_file = true);
 	
+	static void triggerAlerts(const std::string& text);
+
 	static void onClickMute(void *data);
 	static void onClickToggleShowMute(LLUICtrl* caller, void *data);
 	static void onClickToggleActiveSpeakers(void* userdata);
@@ -82,12 +82,9 @@ public:
 	static void loadHistory();
 	static void* createSpeakersPanel(void* data);
 	static void* createChatPanel(void* data);
-
-	// visibility policy for LLUISingleton
-	static bool visible(LLFloater* instance, const LLSD& key);
-	static void show(LLFloater* instance, const LLSD& key);
-	static void hide(LLFloater* instance, const LLSD& key);
-
+	
+	static LLFloaterChat* getInstance(); // *TODO:Skinning Deprecate
+	
 	LLPanelActiveSpeakers* mPanel;
 	BOOL mScrolledToEnd;
 };