diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-26 22:38:19 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-26 22:38:19 +0000 |
| commit | d353c9ae0fe575788f537c72dc9d22834bef8bdb (patch) | |
| tree | daca0c1bc18bd6c7adc907dd8c5e30291b618931 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | 303feae305eb526d75b7d9c8b640407cb8003469 (diff) | |
| parent | 247a3362b8d35541993007a33693186def7f23b0 (diff) | |
Merged in euclid-525 (pull request #499)
Merge recent fixes into LMR#5 RC
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 d604d0a789..80165f9b9a 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -492,7 +492,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++; } } |