From 07d35b1bf55aa7eb7488820de4058d52649c93b9 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Fri, 24 Jul 2026 14:12:37 -0700 Subject: Fix error popup saying voice is incompatible with region voice There is a race condition where voice can start up before the voice server type is retrieved from the region. Since the voice server type defaults to null, and that wasn't allowed, a popup message happened. The default voice type is webrtc, so we connect to that in cases where the voice server type is empty. --- indra/newview/llvoiceclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index b91b4b180b..e005e93cfb 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -120,7 +120,7 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv LLVoiceModuleInterface *getVoiceModule(const std::string &voice_server_type) { #ifndef DISABLE_WEBRTC - if (voice_server_type == WEBRTC_VOICE_SERVER_TYPE) + if (voice_server_type == WEBRTC_VOICE_SERVER_TYPE || voice_server_type.empty()) { return (LLVoiceModuleInterface *) LLWebRTCVoiceClient::getInstance(); } @@ -972,7 +972,7 @@ class LLViewerRequiredVoiceVersion : public LLHTTPNode LLVoiceModuleInterface *voiceModule = NULL; #ifndef DISABLE_WEBRTC - if (voice_server_type == "webrtc" || voice_server_type.empty()) + if (voice_server_type == WEBRTC_VOICE_SERVER_TYPE || voice_server_type.empty()) { voiceModule = (LLVoiceModuleInterface *) LLWebRTCVoiceClient::getInstance(); } -- cgit v1.3