diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-18 14:38:46 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-18 14:38:46 +0200 |
commit | 198587423d0eb343c6091d9af97e4ad12860166e (patch) | |
tree | 18922a60b34b16bdb4df6941850d5565b7cb1d72 /indra/llcommon | |
parent | 3bf89afebec3c535604789f0e2997598ac43bbe6 (diff) | |
parent | 2a49de3befff5e2b48a273f70a21f525b50a189c (diff) |
merge
--HG--
branch : product-engine
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 } |