summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
committerDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
commitbe299644e3448ad2d613b97aba478c5807f346ec (patch)
tree7e38cb35375b235deaf1f0ea5374e6c1bcd10f7f /indra/llcommon
parentc3099df719274556fede1a57bc42e555e5c89fbb (diff)
parent4339600d43601f07d01c676cce5da17c2758c4cb (diff)
Merged from viewer-release
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)