Merge

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index efcaf4263b..1cbc2a3478 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -47,7 +47,7 @@ public:
 	~LLNearbyChat();
 
 	BOOL	postBuild			();
-	void	addMessage			(const LLChat& message);	
+	void	addMessage			(const LLChat& message,bool archive = true);	
 	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
 	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
 
@@ -57,6 +57,10 @@ public:
 
 	virtual void setRect		(const LLRect &rect);
 
+	virtual void updateChatHistoryStyle();
+
+	static void processChatHistoryStyleUpdate(const LLSD& newvalue);
+
 private:
 	virtual void    applySavedVariables();
 
@@ -68,6 +72,8 @@ private:
 private:
 	LLHandle<LLView>	mPopupMenuHandle;
 	LLChatHistory*		mChatHistory;
+
+	std::vector<LLChat> mMessageArchive;
 };
 
 #endif