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/llconversationmodel.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/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 4aa74a550c..27b1f3d20a 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -355,7 +355,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; } @@ -466,7 +466,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); |