summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-07-13 13:40:08 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-07-13 13:40:08 -0600
commit0ba75fe2d6fe8eddd6efaaf8e6c604ea96bb30c0 (patch)
tree3860cba68dc9f5cd53c25d91d0503ed1487508e7 /indra/llcommon
parentb9248bddec805a388772adb38ee707f1307861a6 (diff)
EXT-7400: FIXED: 2.0.2 texture queue gets jammed;
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llqueuedthread.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 809a626c93..e0b56b7973 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -428,9 +428,11 @@ S32 LLQueuedThread::processNextRequest()
llassert_always(req->getStatus() == STATUS_QUEUED);
break;
}
+ U32 start_priority = 0 ;
if (req)
{
req->setStatus(STATUS_INPROGRESS);
+ start_priority = req->getPriority();
}
unlockData();
@@ -439,8 +441,7 @@ S32 LLQueuedThread::processNextRequest()
// safe to access req.
if (req)
{
- // process request
- U32 start_priority = req->getPriority();
+ // process request
bool complete = req->processRequest();
if (complete)