diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
| commit | 0ea94d2948ba8237fd39fa0df219e07ee44c9ff1 (patch) | |
| tree | 71b56d5d6937a66166ca17eb0413a4a88c363113 /indra/newview/llconversationmodel.cpp | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merged master into DRTVWR-539
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 4cfde21e32..a685639427 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -380,7 +380,7 @@ LLConversationItemParticipant* LLConversationItemSession::findParticipant(const for (iter = mChildren.begin(); iter != mChildren.end(); iter++) { participant = dynamic_cast<LLConversationItemParticipant*>(*iter); - if (participant->hasSameValue(participant_id)) + if (participant && participant->hasSameValue(participant_id)) { break; } @@ -491,7 +491,7 @@ const bool LLConversationItemSession::getTime(F64& time) const { participant = dynamic_cast<LLConversationItemParticipant*>(*iter); F64 participant_time; - if (participant->getTime(participant_time)) + if (participant && participant->getTime(participant_time)) { has_time = true; most_recent_time = llmax(most_recent_time,participant_time); |