diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
| commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
| tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/llcommon | |
| parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 06ceeb2bc3..809a626c93 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -133,8 +133,11 @@ S32 LLQueuedThread::updateQueue(U32 max_time_ms) if (mThreaded) { pending = getPending(); + if(pending > 0) + { unpause(); } + } else { while (pending > 0) @@ -459,7 +462,7 @@ S32 LLQueuedThread::processNextRequest() req->setStatus(STATUS_QUEUED); mRequestQueue.insert(req); unlockData(); - if (mThreaded && start_priority <= PRIORITY_LOW) + if (mThreaded && start_priority < PRIORITY_NORMAL) { ms_sleep(1); // sleep the thread a little } |