diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-01 21:45:24 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-01 21:45:24 -0700 |
| commit | 70b47839f307c22906fd5660923afcacccdb568e (patch) | |
| tree | 88cc13079a4eedcf6255c5bb5a5f38503577436e /indra/newview | |
| parent | b5346c6b64ce955ed71ddc6f64bc7a864111a8e4 (diff) | |
| parent | c9c03ffa0ca21eeb2786920cf9c0cb547be8a468 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/newview')
| -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 |