From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 20 Jul 2007 20:38:05 +0000 Subject: svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269 --- indra/llcommon/llworkerthread.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llcommon/llworkerthread.cpp') diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 31f5c1cfcd..5c304077fb 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -84,6 +84,8 @@ S32 LLWorkerThread::update(U32 max_time_ms) } delete *iter; } + // delete and aborted entries mean there's still work to do + res += delete_list.size() + abort_list.size(); return res; } -- cgit v1.2.3