diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
| commit | 0a56031bd3e3645a9e5124a722cece0706469944 (patch) | |
| tree | 39e2244564d2b71d8277231f691160807f8c10b9 /indra/llcommon/llworkerthread.cpp | |
| parent | 885fc3f9b54cca33e134bcfb65c1d2a9c0aeec7a (diff) | |
| parent | fad31dc087cb670bd4479195cac2c31da9a55e57 (diff) | |
automated 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(); |