diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-14 10:26:34 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-14 10:26:34 -0800 |
| commit | 1e1b8d036f3cbcb81768150c66d5e3052118ed4c (patch) | |
| tree | f3655173bebcc81118968e0acb195aea1bc2abae /indra/llcommon/llqueuedthread.cpp | |
| parent | ed06c4b8b937b42882ee1740def365d476bef10e (diff) | |
| parent | 0d258162802e44f8db3c7c3e4369d9a81dadf1f2 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -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(); } |