diff options
| author | Aleric Inglewood | 2010-09-30 15:24:07 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-02 00:43:37 -0700 |
| commit | b699d40645912a87ec54128641557430f20c528a (patch) | |
| tree | 6eb4de3eebb56fb74154bb3ed98a127337c00df5 /linden/indra | |
| parent | RED-575: VWR-13040: LLObjectSelection::valid_root_begin() is really the same ... (diff) | |
| download | meta-impy-b699d40645912a87ec54128641557430f20c528a.zip meta-impy-b699d40645912a87ec54128641557430f20c528a.tar.gz meta-impy-b699d40645912a87ec54128641557430f20c528a.tar.bz2 meta-impy-b699d40645912a87ec54128641557430f20c528a.tar.xz | |
RED-576: SNOW-415: Viewer prints always "WARNING: cleanup: Quitting with pending background tasks"
See http://redmine.imprudenceviewer.org/issues/576
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 0fbcafc..e6b4831 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -1457,8 +1457,11 @@ bool LLAppViewer::cleanup() | |||
| 1457 | pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread | 1457 | pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread |
| 1458 | pending += LLVFSThread::updateClass(0); | 1458 | pending += LLVFSThread::updateClass(0); |
| 1459 | pending += LLLFSThread::updateClass(0); | 1459 | pending += LLLFSThread::updateClass(0); |
| 1460 | F64 idle_time = idleTimer.getElapsedTimeF64(); | 1460 | if (pending == 0) |
| 1461 | if (!pending || idle_time >= max_idle_time) | 1461 | { |
| 1462 | break; | ||
| 1463 | } | ||
| 1464 | if (idleTimer.getElapsedTimeF64() >= max_idle_time) | ||
| 1462 | { | 1465 | { |
| 1463 | llwarns << "Quitting with pending background tasks." << llendl; | 1466 | llwarns << "Quitting with pending background tasks." << llendl; |
| 1464 | break; | 1467 | break; |