From e49e54ab3d10c729a20cdaebc3ed1aa708544c3c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 25 Oct 2016 15:58:10 +0200
Subject: [PATCH] Shutdown speaker volume storage before CRT does it

---
 indra/newview/llvoiceclient.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 090d174f71..2e19f18749 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -183,6 +183,13 @@ void LLVoiceClient::terminate()
 {
 	if (mVoiceModule) mVoiceModule->terminate();
 	mVoiceModule = NULL;
+
+	// <FS:Ansariel> Shutdown speaker volume storage before CRT does it
+	if (LLSpeakerVolumeStorage::instanceExists())
+	{
+		LLSpeakerVolumeStorage::deleteSingleton();
+	}
+	// <FS:Ansariel>
 }
 
 const LLVoiceVersionInfo LLVoiceClient::getVersion()