diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-13 20:28:05 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-07-13 20:28:05 +0300 |
| commit | ff077375b2185d95117237c19f211ffacc5c9608 (patch) | |
| tree | f400d4e91d3c67cc22c4e6bfb24e34b09986f54b | |
| parent | 8e1eb129f23c5522438cff8adcfa0d2ca86ff51d (diff) | |
SL-13597 Crash in LLFloaterIMSessionTab::addConversationViewParticipant
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 6d326f6850..d604d0a789 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -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) |