CHUI-164 : Fix crash when closing ad-hoc conversations; insure consistency of the conversation list when adding and removing items from it

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index c6e7c6a3d9..2a8cbf3e1c 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -112,6 +112,9 @@ public:
 							EDragAndDropType cargo_type,
 							void* cargo_data,
 							std::string& tooltip_msg) { return FALSE; }
+	
+	bool hasSameValues(std::string name, LLFloater* floaterp) { return ((name == mName) && (floaterp == mFloater)); }
+	bool hasSameValue(LLFloater* floaterp) { return (floaterp == mFloater); }
 private:
 	std::string mName;
 	const LLUUID mUUID;
@@ -183,9 +186,10 @@ private:
 	
 	// CHUI-137 : Temporary implementation of conversations list
 public:
-	void removeConversationListItem(const LLUUID& session_id);
+	void removeConversationListItem(const LLUUID& session_id, bool change_focus = true);
+	void addConversationListItem(std::string name, const LLUUID& uuid, LLFloater* floaterp);
+	bool findConversationItem(LLFloater* floaterp, LLUUID& uuid);
 private:
-	void addConversationListItem(std::string name, const LLUUID& uuid, LLFloater* floaterp, LLIMFloaterContainer* containerp);
 	LLFolderViewItem* createConversationItemWidget(LLConversationItem* item);
 	// Conversation list data
 	LLPanel* mConversationsListPanel;	// This is the widget we add items to (i.e. clickable title for each conversation)