diff options
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 797ec27..e54ae96 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; |