livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-662 (Multi select across conversations can result in (???) (???) in the conversation list)

meow-7.2.2
maximbproductengine 2013-01-14 21:48:37 +02:00
parent f5a2929d8f
commit e44677ee79
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloaterimcontainer.cpp
View File

@ -893,7 +893,18 @@ void LLFloaterIMContainer::getSelectedUUIDs(uuid_vec_t& selected_uuids)
for (; it != it_end; ++it)
{
conversationItem = static_cast<LLConversationItem *>((*it)->getViewModelItem());
selected_uuids.push_back(conversationItem->getUUID());
//When a one-on-one conversation exists, retrieve the participant id from the conversation floater
if(conversationItem->getType() == LLConversationItem::CONV_SESSION_1_ON_1)
{
LLFloaterIMSession * conversation_floaterp = LLFloaterIMSession::findInstance(conversationItem->getUUID());
LLUUID participant_id = conversation_floaterp->getOtherParticipantUUID();
selected_uuids.push_back(participant_id);
}
else
{
selected_uuids.push_back(conversationItem->getUUID());
}
}
}
@ -929,17 +940,7 @@ void LLFloaterIMContainer::getParticipantUUIDs(uuid_vec_t& selected_uuids)
return;
}
if (conversation_item->getType() == LLConversationItem::CONV_PARTICIPANT)
{
getSelectedUUIDs(selected_uuids);
}
//When a one-on-one conversation exists, retrieve the participant id from the conversation floater
else if(conversation_item->getType() == LLConversationItem::CONV_SESSION_1_ON_1)
{
LLFloaterIMSession * conversation_floaterp = LLFloaterIMSession::findInstance(conversation_item->getUUID());
LLUUID participant_id = conversation_floaterp->getOtherParticipantUUID();
selected_uuids.push_back(participant_id);
}
getSelectedUUIDs(selected_uuids);
}
void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec_t& selectedIDS)