diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
| commit | eef22e0baf9e62f8c38058ad22e6e6bd5e5aca26 (patch) | |
| tree | 2a498eb73a80802c7811193ce63253c9be905295 /indra/llcommon/llqueuedthread.cpp | |
| parent | 59d575fe615bf14a10056c9b9fe0c109ec2c103e (diff) | |
| parent | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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(); } |