summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-02 18:59:35 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-02 18:59:35 +0300
commit3b7da511179fd2e2e734a4f3137ac8813a5eebee (patch)
tree6642492a8be25cf36de2712d019e31f1681ac9ea /indra/llcommon
parent122209c4a61ce00bc6157c7ae0b9311930f4410b (diff)
parentd1094573117db0a951a7e6159a352b0f4c8a8a24 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llqueuedthread.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index e0b56b7973..809a626c93 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -428,11 +428,9 @@ 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();
@@ -441,7 +439,8 @@ S32 LLQueuedThread::processNextRequest()
// safe to access req.
if (req)
{
- // process request
+ // process request
+ U32 start_priority = req->getPriority();
bool complete = req->processRequest();
if (complete)