diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
| commit | 59ab227c4020565f85e6fc2edf3e3fcc16abb574 (patch) | |
| tree | 94265895fdc0df4d3c38f74288cbd87bc2e01c20 /indra/newview/llvoiceclient.cpp | |
| parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
DRTVWR-528 merge up to 6.4.19
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 57599c9f3a..e2bd1a39c7 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -180,6 +180,13 @@ void LLVoiceClient::terminate() { if (mVoiceModule) mVoiceModule->terminate(); mVoiceModule = NULL; + m_servicePump = NULL; + + // Shutdown speaker volume storage before LLSingletonBase::deleteAll() does it + if (LLSpeakerVolumeStorage::instanceExists()) + { + LLSpeakerVolumeStorage::deleteSingleton(); + } } const LLVoiceVersionInfo LLVoiceClient::getVersion() |