From 74f23cde48829577d330ec0624135b45564af0ac Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 11 Sep 2020 21:34:13 +0300
Subject: SL-13830 Remade vivox shutdown to terminate when it is told to
 shutdown instead of when viewer is quiting

---
 indra/newview/llvoicevivox.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llvoicevivox.h')

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 210c726452..699c85066b 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -912,6 +912,8 @@ private:
     bool    mIsProcessingChannels;
     bool    mIsCoroutineActive;
 
+    static bool sShuttingDown; // corutines can last longer than vivox so we need a static variable as a shutdown flag
+
     LLEventMailDrop mVivoxPump;
 };
 
-- 
cgit v1.2.3