diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-01 14:52:37 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-01 14:52:37 -0700 |
| commit | c9c03ffa0ca21eeb2786920cf9c0cb547be8a468 (patch) | |
| tree | 23dd0258aea49e41207a4a6df0b9099f18ab915f | |
| parent | 9b46ed5f812b2a3bd5e5f0282011556d5dfa147a (diff) | |
fix for sh-2735: LLCurl causes SL to freeze when logout
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9d40a8a60e..e80475f096 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1781,6 +1781,7 @@ bool LLAppViewer::cleanup() pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread pending += LLVFSThread::updateClass(0); pending += LLLFSThread::updateClass(0); + pending += LLCurl::getCurlThread()->update(1) ; F64 idle_time = idleTimer.getElapsedTimeF64(); if(!pending) { @@ -1792,6 +1793,7 @@ bool LLAppViewer::cleanup() break; } } + LLCurl::getCurlThread()->pause() ; // Delete workers first // shotdown all worker threads before deleting them in case of co-dependencies |