From 4864536481aec9484a6a0a8f2895954d3fcf1500 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 15:24:07 +0200
Subject: RED-576: SNOW-415: Viewer prints always "WARNING: cleanup: Quitting
 with pending background tasks"

See http://redmine.imprudenceviewer.org/issues/576
---
 linden/doc/contributions.txt         | 2 ++
 linden/indra/newview/llappviewer.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 71a076d..189bb0c 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -53,6 +53,7 @@ Aleric Inglewood
 	SNOW-203
 	SNOW-240
 	SNOW-408
+	SNOW-415
 	SNOW-479
 	SNOW-626
 	SNOW-766
@@ -69,6 +70,7 @@ Aleric Inglewood
 	RED-567
 	RED-573
 	RED-575
+	RED-576
 Alissa Sabre
 	VWR-81
 	VWR-83
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()
 		pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
 		pending += LLVFSThread::updateClass(0);
 		pending += LLLFSThread::updateClass(0);
-		F64 idle_time = idleTimer.getElapsedTimeF64();
-		if (!pending || idle_time >= max_idle_time)
+		if (pending == 0)
+		{
+			break;
+		}
+		if (idleTimer.getElapsedTimeF64() >= max_idle_time)
 		{
 			llwarns << "Quitting with pending background tasks." << llendl;
 			break;
-- 
cgit v1.1