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

SL-13597 Crash in LLFloaterIMSessionTab::addConversationViewParticipant

master
Mnikolenko Productengine 2020-07-13 20:28:05 +03:00
parent 8e1eb129f2
commit ff077375b2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterimsessiontab.cpp
View File

@ -499,6 +499,12 @@ void LLFloaterIMSessionTab::buildConversationViewParticipant()
void LLFloaterIMSessionTab::addConversationViewParticipant(LLConversationItem* participant_model, bool update_view)
{
if (!participant_model)
{
// Nothing to do if the model is inexistent
return;
}
// Check if the model already has an associated view
LLUUID uuid = participant_model->getUUID();
LLFolderViewItem* widget = get_ptr_in_map(mConversationsWidgets,uuid);
@ -525,8 +531,8 @@ void LLFloaterIMSessionTab::removeConversationViewParticipant(const LLUUID& part
{
mConversationsRoot->extractItem(widget);
delete widget;
mConversationsWidgets.erase(participant_id);
}
mConversationsWidgets.erase(participant_id);
}
void LLFloaterIMSessionTab::updateConversationViewParticipant(const LLUUID& participant_id)