diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-02 20:05:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-02 20:05:35 -0400 |
| commit | 0b7bc35131ce4a526c1e696904c4e8332e1b0fe9 (patch) | |
| tree | 6410603aa44e66f726aebe030ecfa31d37db1f68 /indra/newview/llvoiceclient.cpp | |
| parent | f25c2a56c0c8079163e9ef18f6a9e590341b1e1a (diff) | |
| parent | 18c84a9d6ad2381836a0c8263a8e9cb800b6c28e (diff) | |
Merge pull request #4779 from secondlife/geenz/lua_editor-2025.07
Merge 2025.07 into lua editor
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; |