1 files changed, 87 insertions, 49 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index deeb0e9e0b..a2a54bf02c 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -136,29 +136,17 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
 		openFloater(floaterp->getKey());
 		return;
 	}
+	
+	// Make sure the message panel is open when adding a floater or it stays mysteriously hidden
+	collapseMessagesPane(false);
 
+	// Add the floater
 	LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
 
 	LLUUID session_id = floaterp->getKey();
 
-	// CHUI-137 : Temporary implementation of conversations list
-	// Create a conversation item
-	LLConversationItem* item = new LLConversationItem(floaterp->getTitle(),session_id, floaterp, this);
-	mConversationsItems[session_id] = item;
-	// Create a widget from it
-	LLFolderViewItem* widget = createConversationItemWidget(item);
-	mConversationsWidgets[session_id] = widget;
-	// Add it to the UI
-	widget->setVisible(TRUE);
-	mConversationsListPanel->addChild(widget);
-	LLRect panel_rect = mConversationsListPanel->getRect();
-	S32 item_height = 16;
-	S32 index = mConversationsWidgets.size() - 1;
-	widget->setRect(LLRect(0,
-						   panel_rect.getHeight() - item_height*index,
-						   panel_rect.getWidth(),
-						   panel_rect.getHeight() - item_height*(index+1)));
-	// CHUI-137 : end
+	// Add a conversation list item in the left pane
+	addConversationListItem(floaterp->getTitle(), session_id, floaterp, this);
 	
 	LLView* floater_contents = floaterp->getChild<LLView>("contents_view");
 
@@ -196,35 +184,6 @@ void LLIMFloaterContainer::removeFloater(LLFloater* floaterp)
 {
 	LLMultiFloater::removeFloater(floaterp);
 
-    // CHUI-137 : Temporary implementation of conversations list
-	// Clean up the conversations list
- 	LLUUID session_id = floaterp->getKey();
-    // Delete the widget and the associated conversation item
-    // Note : since the mConversationsItems is also the listener to the widget, deleting 
-    // the widget will also delete its listener
-	conversations_widgets_map::iterator widget_it = mConversationsWidgets.find(session_id);
-	if (widget_it != mConversationsWidgets.end())
-    {
-        LLFolderViewItem* widget = widget_it->second;
-        delete widget;
-    }
-    // Suppress the conversation items and widgets from their respective maps
-	mConversationsItems.erase(session_id);
-	mConversationsWidgets.erase(session_id);
-    // Reposition the leftover conversation items
-	LLRect panel_rect = mConversationsListPanel->getRect();
-	S32 item_height = 16;
-    int index = 0;
-    for (widget_it = mConversationsWidgets.begin(); widget_it != mConversationsWidgets.end(); ++widget_it, ++index)
-    {
-        LLFolderViewItem* widget = widget_it->second;
-        widget->setRect(LLRect(0,
-                               panel_rect.getHeight() - item_height*index,
-                               panel_rect.getWidth(),
-                               panel_rect.getHeight() - item_height*(index+1)));
-    }
-    // CHUI-137 : end
-   
 	LLRect contents_rect = floaterp->getRect();
 
 	// reduce the floater contents height by header height
@@ -411,6 +370,77 @@ void LLIMFloaterContainer::onAvatarPicked(const uuid_vec_t& ids)
 }
 
 // CHUI-137 : Temporary implementation of conversations list
+void LLIMFloaterContainer::addConversationListItem(std::string name, const LLUUID& uuid, LLFloater* floaterp, LLIMFloaterContainer* containerp)
+{
+	// Check if the item is not already in the list, exit if it is (nothing to do)
+	// Note: this happens often, when reattaching a torn off conversation for instance
+	conversations_items_map::iterator item_it = mConversationsItems.find(uuid);
+	if (item_it != mConversationsItems.end())
+	{
+		return;
+	}
+
+	// Create a conversation item
+	LLConversationItem* item = new LLConversationItem(name, uuid, floaterp, containerp);
+	mConversationsItems[uuid] = item;
+
+	// Create a widget from it
+	LLFolderViewItem* widget = createConversationItemWidget(item);
+	mConversationsWidgets[uuid] = widget;
+
+	// Add it to the UI
+	widget->setVisible(TRUE);
+	mConversationsListPanel->addChild(widget);
+	LLRect panel_rect = mConversationsListPanel->getRect();
+	S32 item_height = 16;
+	S32 index = mConversationsWidgets.size() - 1;
+	widget->setRect(LLRect(0,
+						   panel_rect.getHeight() - item_height*index,
+						   panel_rect.getWidth(),
+						   panel_rect.getHeight() - item_height*(index+1)));
+	return;
+}
+
+void LLIMFloaterContainer::removeConversationListItem(const LLUUID& session_id)
+{
+	// Delete the widget and the associated conversation item
+	// Note : since the mConversationsItems is also the listener to the widget, deleting 
+	// the widget will also delete its listener
+	conversations_widgets_map::iterator widget_it = mConversationsWidgets.find(session_id);
+	if (widget_it != mConversationsWidgets.end())
+	{
+		LLFolderViewItem* widget = widget_it->second;
+		delete widget;
+	}
+
+	// Suppress the conversation items and widgets from their respective maps
+	mConversationsItems.erase(session_id);
+	mConversationsWidgets.erase(session_id);
+
+	// Reposition the leftover conversation items
+	LLRect panel_rect = mConversationsListPanel->getRect();
+	S32 item_height = 16;
+	int index = 0;
+	for (widget_it = mConversationsWidgets.begin(); widget_it != mConversationsWidgets.end(); ++widget_it, ++index)
+	{
+		LLFolderViewItem* widget = widget_it->second;
+		widget->setRect(LLRect(0,
+							   panel_rect.getHeight() - item_height*index,
+							   panel_rect.getWidth(),
+							   panel_rect.getHeight() - item_height*(index+1)));
+	}
+	
+	// Don't let the focus fall IW, select and refocus on the first conversation in the list
+	setFocus(TRUE);
+	conversations_items_map::iterator item_it = mConversationsItems.begin();
+	if (item_it != mConversationsItems.end())
+	{
+		LLConversationItem* item = item_it->second;
+		item->selectItem();
+	}
+	return;
+}
+
 LLFolderViewItem* LLIMFloaterContainer::createConversationItemWidget(LLConversationItem* item)
 {
 	LLFolderViewItem::Params params;
@@ -443,8 +473,16 @@ LLConversationItem::LLConversationItem(std::string name, const LLUUID& uuid, LLF
 // Virtual action callbacks
 void LLConversationItem::selectItem(void)
 {
-    // Switch to the conversation floater that is being selected
-    mContainer->selectFloater(mFloater);
+	LLMultiFloater* host_floater = mFloater->getHost();
+	if (host_floater == mContainer)
+	{
+		// Always expand the message pane if the panel is hosted by the container
+		mContainer->collapseMessagesPane(false);
+		// Switch to the conversation floater that is being selected
+		mContainer->selectFloater(mFloater);
+	}
+	// Set the focus on the selected floater
+	mFloater->setFocus(TRUE);    
 }
 
 void LLConversationItem::performAction(LLInventoryModel* model, std::string action)