diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-12-18 13:24:29 -0600 |
| commit | 6aa71844a8949ab3c75b6cbe1a5f8cb811aa27b8 (patch) | |
| tree | e73b1d2847a33c7568688f85265913a69d1711a2 /indra/llcommon/llqueuedthread.cpp | |
| parent | 5015886e1763887f534321790d56b6cee5a75dfa (diff) | |
| parent | d5b53eb483ec042d83859ec957dce7699c7469aa (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -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 } |