diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-18 13:52:05 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-18 13:52:05 +0200 |
| commit | 2a49de3befff5e2b48a273f70a21f525b50a189c (patch) | |
| tree | d96f3ceaa848345e1857e71a1a12cd0ba0f6c4bf /indra/llcommon/llqueuedthread.cpp | |
| parent | 688e66fe299ba4f4afe080d907a4eff9cc77f6dd (diff) | |
| parent | ad65fa11acdf7f655f32e6ca43b2f2bc997ef1e6 (diff) | |
Merge from default branch.
--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 } |