summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakers.cpp
diff options
context:
space:
mode:
authorRoxanne Skelly <roxanne@roxiware.com>2024-05-03 15:07:20 -0700
committerGitHub <noreply@github.com>2024-05-03 15:07:20 -0700
commit818c8c6deaa755c02b64fb03766ee03d66021968 (patch)
tree75bf206410bff1c655a15dd80ca05abdab81f581 /indra/newview/llspeakers.cpp
parentb425165addbe1c141e050556ff4aa18c8d042dab (diff)
parentcce51e98b188371fa864291f943452188d0e0a94 (diff)
Merge pull request #1401 from secondlife/webrtc-voice
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)