diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
| commit | 0bba892bb0b146a2c20597d8cfe6eb0353c17f06 (patch) | |
| tree | 15d3ad979533feb32114589a5fd4f79e4aa8a5ae /indra/newview/llvoicevivox.cpp | |
| parent | dfc406f0ff4e03e36c3d877c9bd57d2c18e08d43 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
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(); |