diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 16:48:53 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 16:48:53 -0800 |
| commit | 7105ad1def21c3e55c5c650a954b966553fe4174 (patch) | |
| tree | c9259c9a4a2b23c4cfc575529f1c92d17d5a2141 /indra/llcommon | |
| parent | e75242fd56ace32f7d65386f499ff104dde0eca6 (diff) | |
| parent | b29b9c961900f98121ba80447e1e737cff0d4331 (diff) | |
Merge.
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 } |