From 4c4d23acb00960d1bc812eab4656d3f4cdcd70e3 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Fri, 26 Apr 2024 21:31:06 -0700
Subject: Renegotiate voice if the voice server type has changed.

The server will send an update with new voice credentials
when another peer comes in requiring vivox, if the channel
was initially webrtc.
---
 indra/newview/llspeakers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llspeakers.cpp')

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)
-- 
cgit v1.2.3