diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-11-10 13:45:30 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-11-10 13:45:30 -0800 |
| commit | 059925eafb66dc0e2d8ef9c113ca8980a34c655d (patch) | |
| tree | 4189394ddc4257f9e448ed878d0b1b15766fa7a4 /indra/newview | |
| parent | a743d939071fbdbbf619f2e282419623da932322 (diff) | |
Added code to initiate controlled shutdown of plugins with timeouts for misbeahving plugin.
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" |