diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-30 10:10:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-30 10:10:16 +0100 |
| commit | 6f339d5e9eb0a43f70effdf069d414e0ee7fff2c (patch) | |
| tree | c8070823806fbeb68ea0813d9a766a1b1db458f2 /indra/newview/llappviewer.cpp | |
| parent | 4f46e777a501ff0bfedaf657ac6decdeba8acbe5 (diff) | |
| parent | d597a7e36a0a8c4cbee70b053c41aa01afeab6b5 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 7bfe6a46c9..8f14b8d782 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1548,6 +1548,9 @@ bool LLAppViewer::cleanup() LLViewerMedia::saveCookieFile(); + // Stop the plugin read thread if it's running. + LLPluginProcessParent::setUseReadThread(false); + llinfos << "Shutting down Threads" << llendflush; // Let threads finish |