diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/llcommon | |
parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 5 |
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) |