diff options
| author | Bennett Goble <signal@lindenlab.com> | 2025-09-29 09:25:01 -0700 |
|---|---|---|
| committer | Bennett Goble <signal@lindenlab.com> | 2025-09-29 09:25:01 -0700 |
| commit | bdf942b94a9a9d054b4158b8bdd14fe0234b59b6 (patch) | |
| tree | 5ced61fae6d97617b11ade939ba9b5f364466f68 /indra/newview/llvoiceclient.cpp | |
| parent | 254ecf4184e14ab245f180df634530cf04d3b4f9 (diff) | |
| parent | 79909b8a335b9fdeaefe384528284538e8dae6a4 (diff) | |
Merge branch 'release/2025.07' into develop
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 9 |
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; |