diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-14 14:43:53 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-14 14:43:53 +0300 |
| commit | 1f2dcfd866390be1a3a1b1f9406bca861d32c4b4 (patch) | |
| tree | 2406da619100b2aef6a70e8b346245999dfc8266 /indra/llcommon/llqueuedthread.cpp | |
| parent | 84a6b197600d3f6c2dc35c8372ace004b290b2c8 (diff) | |
| parent | 37fc4e42dd173d92abb31be83dbd04fa3b7b70fa (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -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) |