1 files changed, 83 insertions, 24 deletions

diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 62a41c17cb..b38111defa 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -1,8 +1,8 @@
- /** 
+/** 
  * @file llnearbychat.h
- * @brief nearby chat history scrolling panel implementation
+ * @brief LLNearbyChat class definition
  *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
  * 
@@ -24,9 +24,16 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLNEARBYCHAT_H_
-#define LL_LLNEARBYCHAT_H_
+#ifndef LL_LLNEARBYCHAT_H
+#define LL_LLNEARBYCHAT_H
 
+#include "llimconversation.h"
+#include "llcombobox.h"
+#include "llgesturemgr.h"
+#include "llchat.h"
+#include "llvoiceclient.h"
+#include "lloutputmonitorctrl.h"
+#include "llspeakers.h"
 #include "llscrollbar.h"
 #include "llviewerchat.h"
 #include "llpanel.h"
@@ -35,32 +42,88 @@ class LLResizeBar;
 class LLChatHistory;
 
 class LLNearbyChat
-	: public LLPanel
+	:	public LLIMConversation
 {
 public:
-	LLNearbyChat(const Params& p = LLPanel::getDefaultParams());
+	// constructor for inline chat-bars (e.g. hosted in chat history window)
+	LLNearbyChat(const LLSD& key);
+	~LLNearbyChat() {}
 
-	BOOL	postBuild			();
-
-	/** @param archive true - to save a message to the chat history log */
-	void	addMessage			(const LLChat& message,bool archive = true, const LLSD &args = LLSD());	
-	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
-	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
-
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual void	draw();
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void onOpen(const LLSD& key);
 
 	// focus overrides
 	/*virtual*/ void	onFocusLost();
 	/*virtual*/ void	onFocusReceived();
-	
+
 	/*virtual*/ void	setVisible(BOOL visible);
-	
+
 	void loadHistory();
     void reloadMessages();
-	static LLNearbyChat* getInstance();
 	void removeScreenChat();
 
+	static LLNearbyChat* getInstance();
+
+	void addToHost();
+
+	/** @param archive true - to save a message to the chat history log */
+	void	addMessage			(const LLChat& message,bool archive = true, const LLSD &args = LLSD());
+	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
+	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
+
+	LLLineEditor* getChatBox() { return mChatBox; }
+
+	//virtual void draw();
+
+	std::string getCurrentChat();
+
+	virtual BOOL handleKeyHere( KEY key, MASK mask );
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
+
+	static void startChat(const char* line);
+	static void stopChat();
+
+	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
+	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
+
+	void showHistory();
+	void showTranslationCheckbox(BOOL show);
+
+protected:
+	static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
+	static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
+	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
+	void onChatBoxFocusReceived();
+
+	void sendChat( EChatType type );
+	void onChatBoxCommit();
+	void onChatFontChange(LLFontGL* fontp);
+
+	/* virtual */ bool applyRectControl();
+
+	void onToggleNearbyChatPanel();
+
+	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
+	EChatType processChatTypeTriggers(EChatType type, std::string &str);
+
+	void displaySpeakingIndicator();
+
+	void onCallButtonClicked();
+
+	// set the enable/disable state for the Call button
+	virtual void enableDisableCallBtn();
+
+	// Which non-zero channel did we last chat on?
+	static S32 sLastSpecialChatChannel;
+
+	LLLineEditor*			mChatBox;
+	LLOutputMonitorCtrl*	mOutputMonitor;
+	LLLocalSpeakerMgr*		mSpeakerMgr;
+
+	S32 mExpandedHeight;
+
+	/*virtual*/ BOOL tick();
+
 private:
 
 	void	getAllowedRect		(LLRect& rect);
@@ -68,14 +131,10 @@ private:
 	void appendMessage(const LLChat& chat, const LLSD &args = 0);
 	void	onNearbySpeakers	();
 
-
-private:
 	LLHandle<LLView>	mPopupMenuHandle;
+	std::vector<LLChat> mMessageArchive;
 	LLChatHistory*		mChatHistory;
 
-	std::vector<LLChat> mMessageArchive;
 };
 
 #endif
-
-