From 3017b1bae163881b0ef9aff3071865431970927b Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Fri, 6 Sep 2024 12:00:00 -0700
Subject: Don't enable vivox spatial when teleporting while in a webrtc
 conference/p2p/group call

Processing for vivox was being enabled when teleporting into a vivox region
regardless as to whether the user was in a conference/p2p/group call, resulting
in vivox spatial and webrtc conference/p2p/group simultaneously being active.
---
 indra/newview/llvoiceclient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 5af7528ada..1a35a71706 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -256,8 +256,8 @@ void LLVoiceClient::setSpatialVoiceModule(const std::string &voice_server_type)
         if (inProximalChannel())
         {
             mSpatialVoiceModule->processChannels(false);
+            module->processChannels(true);
         }
-        module->processChannels(true);
         mSpatialVoiceModule = module;
         mSpatialVoiceModule->updateSettings();
     }
-- 
cgit v1.2.3