diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-23 10:37:46 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-23 10:37:46 -0700 |
| commit | 913ea3ea8f15b98dc5df042e1499bb18520f2c6f (patch) | |
| tree | 672cccc900f0184b3b377f21ccdfb4e193a8d6f6 /indra/llcommon | |
| parent | 0cad953a96371bb05ff8796e90798b636d1e37f3 (diff) | |
| parent | 0b3099fbca36be1012ddaeaf1e6cd5673caa1aca (diff) | |
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(); |