diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
| commit | 07de4edbc45de93c04bc4d0a7c174a45c902b50f (patch) | |
| tree | 14d90da452bb109e6f94567f057fac5f41ef0cf0 /indra/llcommon | |
| parent | 2edbd733843d5ad0f9ec3dec49e676651bda07af (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 411977474b..2629237f7e 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -347,12 +347,12 @@ bool LLWorkerClass::checkWork(bool aborting) { mRequestHandle = LLWorkerThread::nullHandle(); clearFlags(WCF_HAVE_WORK); - return true ; } else { llassert_always(workreq); } + return true ; } LLQueuedThread::status_t status = workreq->getStatus(); |