diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:48 -0600 |
| commit | 472928043a82ff8f622c96df73c5938c9fb7a455 (patch) | |
| tree | d795d47eff1c609b42ab3b57be3a7c11538b1b23 /indra/newview/llappviewer.cpp | |
| parent | 893b5e16b81ead08ef22b03594e0a835df525778 (diff) | |
| parent | 85392acac0a10e274a3134180265b7b233d8b479 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8946bb6904..9d40a8a60e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1381,6 +1381,11 @@ bool LLAppViewer::mainLoop() } } gMeshRepo.update() ; + + if(!LLCurl::getCurlThread()->update(1)) + { + LLCurl::getCurlThread()->pause() ; //nothing in the curl thread. + } if(!total_work_pending) //pause texture fetching threads if nothing to process. { |