diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
| commit | c3d7cd4ac12fd73bf3d7abd402312765a71e06c3 (patch) | |
| tree | 3778170a54540aeda742494df8d18b8383e11f23 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | 639acb6ff7495a6840d437dd8473172ec03e200a (diff) | |
| parent | 9dc6a6a1b7ec21a578ac6f5a92eb16037f323824 (diff) | |
Merged in DV528-merge-6.4.20 (pull request #591)
DRTVWR-528 merge up to 6.4.20
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index e7f428c06a..7541bb5efe 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -497,7 +497,10 @@ void LLFloaterIMSessionTab::buildConversationViewParticipant() while (current_participant_model != end_participant_model) { LLConversationItem* participant_model = dynamic_cast<LLConversationItem*>(*current_participant_model); - addConversationViewParticipant(participant_model); + if (participant_model) + { + addConversationViewParticipant(participant_model); + } current_participant_model++; } } |