diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-07-04 16:18:08 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-07-04 16:18:08 +0300 |
| commit | c895f8c06282bd3298790113f1305c92d9f268e9 (patch) | |
| tree | 7777c23f150d6cce07acd95f61ce15613e4adc03 /indra/newview/llappviewer.cpp | |
| parent | 5346e7909ff6d462ee3c28504030b33b3e497d0f (diff) | |
MAINT-8800 Vivox pointlesly stalls for 10 seconds waiting on shutdown
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index acec68f393..687b76c224 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1581,6 +1581,11 @@ bool LLAppViewer::doFrame() saveFinalSnapshot(); } + if (LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->terminate(); + } + delete gServicePump; destroyMainloopTimeout(); @@ -1680,11 +1685,6 @@ bool LLAppViewer::cleanup() // Give any remaining SLPlugin instances a chance to exit cleanly. LLPluginProcessParent::shutdown(); - if (LLVoiceClient::instanceExists()) - { - LLVoiceClient::getInstance()->terminate(); - } - disconnectViewer(); LL_INFOS() << "Viewer disconnected" << LL_ENDL; |