diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-06-26 15:46:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 15:46:07 -0700 |
| commit | 9bc3dfbdeaba904999880f6b59306128c98469e8 (patch) | |
| tree | 025ce6c54606f460ccc48bc90b2678b626cee9b5 /indra/newview/llimview.cpp | |
| parent | 39473866fc8119a8ec10935f21b6d8d76432ecd1 (diff) | |
| parent | 33418a77b716e122da9778869cdbabe97c83ff37 (diff) | |
Merge pull request #1850 from secondlife/roxie/webrtc-voice-crash-fixes
Various crash fixes. ALso fixes an issue with adhoc/group calls on vivox regions.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 014dd90406..d3f013c67c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3413,11 +3413,11 @@ LLUUID LLIMMgr::addSession( ((IM_NOTHING_SPECIAL == dialog) || (IM_SESSION_P2P_INVITE == dialog) || (IM_SESSION_CONFERENCE_START == dialog)) && ids.size()) { - LLIMModel::LLIMSession* ad_hoc_found = LLIMModel::getInstance()->findAdHocIMSession(ids); - if (ad_hoc_found) + session = LLIMModel::getInstance()->findAdHocIMSession(ids); + if (session) { new_session = false; - session_id = ad_hoc_found->mSessionID; + session_id = session->mSessionID; } } @@ -3853,7 +3853,7 @@ bool LLIMMgr::startCall(const LLUUID& session_id, LLVoiceChannel::EDirection dir { LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(session_id); if (!voice_channel) return false; - if (!voice_channel_info.isUndefined()) + if (voice_channel_info.isDefined() && voice_channel_info.isMap() && voice_channel_info.size() > 0) { voice_channel->setChannelInfo(voice_channel_info); } |