summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakers.cpp
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2024-04-28 21:03:33 -0700
committerGitHub <noreply@github.com>2024-04-28 21:03:33 -0700
commit7cdc327de9df4773f933e1e558eb79c9aabfa787 (patch)
tree71a5ba489948e8a95ff1b6228733f6d97cac2441 /indra/newview/llspeakers.cpp
parentb09070a3acc229a933f2001c0025c913240d823b (diff)
parent57182b2ac01007d3d5d11c98e811e05d2c50405c (diff)
Merge pull request #1349 from secondlife/roxie/webrtc-voice
[WebRTC-Voice] Fix server reconnect issue (and other issues)
Diffstat (limited to 'indra/newview/llspeakers.cpp')
-rw-r--r--indra/newview/llspeakers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 60bada8f58..00691d4382 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -618,7 +618,7 @@ void LLSpeakerMgr::getSpeakerList(speaker_list_t* speaker_list, BOOL include_tex
const LLUUID LLSpeakerMgr::getSessionID()
{
- return mVoiceChannel->getSessionID();
+ return mVoiceChannel ? mVoiceChannel->getSessionID() : LLUUID();
}
bool LLSpeakerMgr::isSpeakerToBeRemoved(const LLUUID& speaker_id)