diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:13 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:13 +0300 |
| commit | f4bfaeb45e57ae0a62a47dc4f2759a34fe7a7581 (patch) | |
| tree | 56720eb39b5056adc8de4f487d3ba00ceea998d0 /indra/newview/llvoicevivox.h | |
| parent | 9abbdb74f254731a1d0a6e4bf3cfe7b8cdaeff8b (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; }; |