diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-15 22:42:16 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-15 22:42:16 -0800 |
| commit | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (patch) | |
| tree | 15377ab83bf39d6a2ee3ffcc35c10d824a92e7cf /indra/llcommon | |
| parent | c6f1c8e7044261677db195d20c397e0e93342b4e (diff) | |
| parent | 651541a899f8674e06501686de4fc4715ff0d044 (diff) | |
merge
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(); } |