diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
commit | 5dfc8d4c84d2f3d14b08988f2af4e5b14fc47a72 (patch) | |
tree | 3d757eca2107a93db7ad6d87b9b5068d90d566d9 /indra/llcommon/llqueuedthread.cpp | |
parent | f7fadaa807a0652df1da41ac69ab069273605965 (diff) | |
parent | a09c2ba7ac798386b462745774d01c75102beaaf (diff) |
merge
--HG--
branch : product-engine
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 } |