summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2024-09-06 13:40:25 -0700
committerGitHub <noreply@github.com>2024-09-06 13:40:25 -0700
commit9ce23ccc5ea75442fd44173befdadaf6cc9d2ec2 (patch)
tree60eef978702ac6c3b1ea607ddfb9f8f5f442d6e1 /indra/newview
parent6af471482d6801530915c1c9ae4bdf788af52eae (diff)
parent3017b1bae163881b0ef9aff3071865431970927b (diff)
Merge pull request #2522 from secondlife/roxie/webrtc-281
Don't enable vivox spatial when teleporting while in a webrtc conference/p2p/group call
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoiceclient.cpp2
1 files changed, 1 insertions, 1 deletions
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();
}