summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-14 10:25:14 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-14 10:25:14 -0800
commit0d258162802e44f8db3c7c3e4369d9a81dadf1f2 (patch)
tree1523496965a7295d27a83ca669cafc55bd124b31 /indra/llcommon
parenta39bda1b775a161558f75bd0a23575b8ef78a80e (diff)
parent637b6673bcceb90783b674ed90217143ecb48fe3 (diff)
merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llqueuedthread.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index e7ad571a90..eacbbb3ee0 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -96,6 +96,7 @@ void LLQueuedThread::shutdown()
if (req->getStatus() == STATUS_QUEUED || req->getStatus() == STATUS_INPROGRESS)
{
++active_count;
+ req->setStatus(STATUS_ABORTED); // avoid assert in deleteRequest
}
req->deleteRequest();
}