diff options
author | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
commit | 6cd862063d8e9ce68efd0e15aeb3da76160fcd81 (patch) | |
tree | 3f98c889d39e5fcf303bf08615a51d400ec64cde /indra/llcommon | |
parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) |
merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 5 |
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) |