diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 19:46:00 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 19:46:00 -0500 |
| commit | a08467ae262549fe89a6ab3539582b3d015ad53f (patch) | |
| tree | 0635965e3cbce94bd686de873d8a0b85f5755172 /indra/llcommon | |
| parent | e1c839f16d521d5b7c4a8bf56120f4da2a28e114 (diff) | |
| parent | b29b9c961900f98121ba80447e1e737cff0d4331 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index eacbbb3ee0..06ceeb2bc3 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -437,6 +437,7 @@ S32 LLQueuedThread::processNextRequest() if (req) { // process request + U32 start_priority = req->getPriority(); bool complete = req->processRequest(); if (complete) @@ -457,9 +458,8 @@ S32 LLQueuedThread::processNextRequest() lockData(); req->setStatus(STATUS_QUEUED); mRequestQueue.insert(req); - U32 priority = req->getPriority(); unlockData(); - if (priority < PRIORITY_NORMAL) + if (mThreaded && start_priority <= PRIORITY_LOW) { ms_sleep(1); // sleep the thread a little } |