summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-10-10 01:10:53 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-10-12 22:26:50 +0300
commita5dd5037f894338ee97e458041d22ceae9cd0183 (patch)
treef5a25f2f1a2fbccfbc678a7fd1e318fa99dc3622 /indra/newview
parentd9c779d59ce3c32e3dd64ac83b2869756a689747 (diff)
SL-13830 One more crash when quiting on startup or right after teleport
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoicevivox.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 976ef61d8e..a8d668420e 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1744,6 +1744,12 @@ bool LLVivoxVoiceClient::waitForChannel()
return false;
}
+ if (sShuttingDown)
+ {
+ logoutOfVivox(true);
+ return false;
+ }
+
if (LLVoiceClient::instance().getVoiceEffectEnabled())
{
retrieveVoiceFonts();