diff options
| author | Richard Linden <none@none> | 2010-03-23 11:29:12 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-23 11:29:12 -0700 |
| commit | 3d977127559280bf37a89714893a13eb288e634f (patch) | |
| tree | 2df7dde6f77d86428f6a3e8da66e6e60bac023db /indra/llcommon/llworkerthread.cpp | |
| parent | 07bc1f0ba52cfcd107f6cf12ab4e5372640b2143 (diff) | |
| parent | b30488f9eeba8b2f8744196c8468925f6268f462 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
| -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(); |