diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
| commit | 7eaae1fe819aef7dc8ac20387e62c3d13ab6d72f (patch) | |
| tree | 64448ec622eb8b4d4c40c1b43821bd8a9c5c4a08 /indra/newview/llappviewer.cpp | |
| parent | 07c207346f63d464e45efe0be3aae64138982279 (diff) | |
| parent | 10b073413548db34ec4c6c6f6976414cd97f9954 (diff) | |
Merge
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 2f9bbb1407..4f7c0c3549 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1530,6 +1530,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 |