Skip to content
Snippets Groups Projects
Commit 49596f4b authored by Merov Linden's avatar Merov Linden
Browse files

CHUI-148 : Fix reattaching on a hidden message panel; also prevents recreation...

CHUI-148 : Fix reattaching on a hidden message panel; also prevents recreation of list items (eventually lead to crashes).
parent c0842339
No related branches found
No related tags found
No related merge requests found
...@@ -123,7 +123,11 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, ...@@ -123,7 +123,11 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
openFloater(floaterp->getKey()); openFloater(floaterp->getKey());
return; 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); LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
LLUUID session_id = floaterp->getKey(); LLUUID session_id = floaterp->getKey();
...@@ -355,6 +359,14 @@ void LLIMFloaterContainer::onAvatarPicked(const uuid_vec_t& ids) ...@@ -355,6 +359,14 @@ void LLIMFloaterContainer::onAvatarPicked(const uuid_vec_t& ids)
// CHUI-137 : Temporary implementation of conversations list // CHUI-137 : Temporary implementation of conversations list
void LLIMFloaterContainer::addConversationListItem(std::string name, const LLUUID& uuid, LLFloater* floaterp, LLIMFloaterContainer* containerp) 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 // Create a conversation item
LLConversationItem* item = new LLConversationItem(name, uuid, floaterp, containerp); LLConversationItem* item = new LLConversationItem(name, uuid, floaterp, containerp);
mConversationsItems[uuid] = item; mConversationsItems[uuid] = item;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment