summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-03-25 17:14:27 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-03-25 17:14:27 -0600
commit81350ec5a9b357a99682ba0b524a08ac4a2c3c4f (patch)
treec34aa84636f78d86aec564fa0a90b94d0f15b6aa /indra/llcommon
parent11e6e208d43f1347037fb312921a65af138f47b4 (diff)
more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llqueuedthread.cpp5
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
}