summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-09-19 21:27:01 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-09-20 00:32:04 +0300
commit3ff163887d49363e9d2d48ea343fa1c8da19c061 (patch)
tree6f9c8563a11ff2b1131ee3ab6dc36fc080a146cc /indra/newview/llvoiceclient.cpp
parent5a0ada943de577091a9518dff651214616c3fc6a (diff)
#4695 Fix missing voice cleanup
Cleanup is in LLVoiceClient::terminate() gWebRTCImpl was never deleted Added mDeviceModule security
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 3edd2b473c..71a9e71a9f 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -292,7 +292,14 @@ void LLVoiceClient::setHidden(bool hidden)
void LLVoiceClient::terminate()
{
- if (mSpatialVoiceModule) mSpatialVoiceModule->terminate();
+ if (LLVivoxVoiceClient::instanceExists())
+ {
+ LLWebRTCVoiceClient::getInstance()->terminate();
+ }
+ if (LLVivoxVoiceClient::instanceExists())
+ {
+ LLVivoxVoiceClient::getInstance()->terminate();
+ }
mSpatialVoiceModule = NULL;
m_servicePump = NULL;