diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
| commit | 6f77f8891a7b0e95e1ea946b48dcac93dc68fa1a (patch) | |
| tree | b22e29c4ebc608de4813d4a6518447b2d7b64f10 /indra/llcommon | |
| parent | ebea9eed4d30376e8914c0e778250ecc45f9dd22 (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
viewer2 merge
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(); |