CHUI-146 : Refocus on the first conversation when closing another conversation, don't let focus falls out

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index bedf3315e8..04fb2f3b9a 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -405,6 +405,15 @@ void LLIMFloaterContainer::removeConversationListItem(const LLUUID& session_id)
 							   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;
 }