diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
commit | 6cea252986ef6d33f2e37333a286362b8e0272c5 (patch) | |
tree | ec0e4d56a9dc2d8a97cc9bce4744b097f4b7efe4 /indra/llcommon | |
parent | 2b0a997b13de15c7aae009b52d7353c97e1781f3 (diff) | |
parent | 815f336a157cc33233633deed66634195d3dc552 (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 1 |
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(); } |