diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2026-07-24 14:12:37 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2026-08-18 14:09:03 -0700 |
| commit | 07d35b1bf55aa7eb7488820de4058d52649c93b9 (patch) | |
| tree | 6184f4d3441b1415f5aab789274f3bb6c8595a1a | |
| parent | ae3e2ee100b0166525b149aecbde5f68ebc683b2 (diff) | |
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.
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |