1 files changed, 23 insertions, 7 deletions
diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h
index d1e2bfff55..93a1ab847e 100644
--- a/indra/newview/llimconversation.h
+++ b/indra/newview/llimconversation.h
@@ -35,6 +35,8 @@
 #include "lleventtimer.h"
 #include "llimview.h"
 #include "llconversationmodel.h"
+#include "llconversationview.h"
+#include "lltexteditor.h"
 
 class LLPanelChatControlPanel;
 class LLChatEntry;
@@ -80,7 +82,16 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ void setVisible(BOOL visible);
 	/*virtual*/ void setFocus(BOOL focus);
-
+	
+	// Handle the left hand participant list widgets
+	void addConversationViewParticipant(LLConversationItem* item);
+	void removeConversationViewParticipant(const LLUUID& participant_id);
+	void updateConversationViewParticipant(const LLUUID& participant_id);
+	void refreshConversation();
+	void buildConversationViewParticipant();
+
+	void setSortOrder(const LLConversationSort& order);
+	
 	virtual void updateMessages() {}
 
 protected:
@@ -100,15 +111,15 @@ protected:
 	// refresh a visual state of the Call button
 	void updateCallBtnState(bool callIsActive);
 
-	void buildParticipantList();
-	void onSortMenuItemClicked(const LLSD& userdata);
-
 	void hideOrShowTitle(); // toggle the floater's drag handle
 	void hideAllStandardButtons();
 
 	/// Update floater header and toolbar buttons when hosted/torn off state is toggled.
 	void updateHeaderAndToolbar();
 
+	// Update the input field help text and other places that need the session name
+	virtual void updateSessionName(const std::string& name);
+
 	// set the enable/disable state for the Call button
 	virtual void enableDisableCallBtn();
 
@@ -126,10 +137,15 @@ protected:
 
 	LLIMModel::LLIMSession* mSession;
 
-	LLLayoutPanel* mParticipantListPanel;
-	LLParticipantList* mParticipantList;
-	LLUUID mSessionID;
+	// Participants list: model and view
+	LLConversationViewParticipant* createConversationViewParticipant(LLConversationItem* item);
+	
+	LLUUID mSessionID; 
+	LLLayoutPanel* mParticipantListPanel;	// add the widgets to that see mConversationsListPanel
+	LLParticipantList* getParticipantList();
+	conversations_widgets_map mConversationsWidgets;
 	LLConversationViewModel mConversationViewModel;
+	LLFolderView* mConversationsRoot;
 
 	LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;