1 files changed, 78 insertions, 30 deletions

diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 7c5975cbc5..7c58e3037e 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,60 +24,108 @@
  * $/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 "llfloater.h"
+#include "llpanel.h"
 
 class LLResizeBar;
-class LLChatHistory;
 
-class LLNearbyChat: public LLPanel
+class LLNearbyChat
+	:	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			();
+	/*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();
+	void removeScreenChat();
+
+	static LLNearbyChat* getInstance();
+
+	void addToHost();
+	void show();
+	bool isChatVisible() const;
 
 	/** @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	addMessage			(const LLChat& message,bool archive = true, const LLSD &args = LLSD());
 	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
 	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
 
+	LLChatEntry* getChatBox() { return mInputEditor; }
+
+	std::string getCurrentChat();
+
+	virtual BOOL handleKeyHere( KEY key, MASK mask );
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual void	draw();
 
-	// focus overrides
-	/*virtual*/ void	onFocusLost();
-	/*virtual*/ void	onFocusReceived();
-	
-	/*virtual*/ void	setVisible(BOOL visible);
-	
-	virtual void updateChatHistoryStyle();
+	static void startChat(const char* line);
+	static void stopChat();
 
-	static void processChatHistoryStyleUpdate(const LLSD& newvalue);
+	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
+	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
 
-	void loadHistory();
+	void showHistory();
 
-	static LLNearbyChat* getInstance();
-	void removeScreenChat();
+protected:
+	static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
+	static void onChatBoxKeystroke(LLTextEditor* caller, void* userdata);
+	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
+	void onChatBoxFocusReceived();
 
-private:
+	void sendChat( EChatType type );
+	void onChatBoxCommit();
+	void onChatFontChange(LLFontGL* fontp);
 
-	void	getAllowedRect		(LLRect& rect);
+	/*virtual*/ void onTearOffClicked();
 
-	void	onNearbySpeakers	();
+	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
+	EChatType processChatTypeTriggers(EChatType type, std::string &str);
+
+	void displaySpeakingIndicator();
+
+	// set the enable/disable state for the Call button
+	virtual void enableDisableCallBtn();
+
+	// Which non-zero channel did we last chat on?
+	static S32 sLastSpecialChatChannel;
+
+	LLOutputMonitorCtrl*	mOutputMonitor;
+	LLLocalSpeakerMgr*		mSpeakerMgr;
 
+	S32 mExpandedHeight;
 
 private:
-	LLHandle<LLView>	mPopupMenuHandle;
-	LLChatHistory*		mChatHistory;
 
+	// prepare chat's params and out one message to chatHistory
+	void appendMessage(const LLChat& chat, const LLSD &args = 0);
+	void	onNearbySpeakers	();
+
+	/*virtual*/ void refresh();
+
+	LLHandle<LLView>	mPopupMenuHandle;
 	std::vector<LLChat> mMessageArchive;
+
 };
 
 #endif
-
-