diff options
| author | callum_linden <none@none> | 2015-11-10 15:43:51 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-11-10 15:43:51 -0800 |
| commit | ca8478454e02d15337329872def5593a9ece21d6 (patch) | |
| tree | 3eebabd1974ee4e5f74bfc31a9b2aa7ee6f93717 /indra/newview | |
| parent | abc9df45dae46e7372e8beb840a1294e5a64a94d (diff) | |
| parent | f023f87979b1ea49e8a438ee3a006ec4e231962f (diff) | |
merge with head
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/tests/llmediadataclient_test.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 03a8756ac8..f0cfd052cf 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1730,6 +1730,9 @@ bool LLAppViewer::cleanup() // to ensure shutdown order LLMortician::setZealous(TRUE); + // Give any remaining SLPlugin instances a chance to exit cleanly. + LLPluginProcessParent::shutdown(); + LLVoiceClient::getInstance()->terminate(); disconnectViewer(); diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp index 6f57daf151..7cb4aeb121 100755 --- a/indra/newview/tests/llmediadataclient_test.cpp +++ b/indra/newview/tests/llmediadataclient_test.cpp @@ -26,7 +26,7 @@ #include "linden_common.h" #include "../llviewerprecompiledheaders.h" - + #include <iostream> #include "../test/lltut.h" |