diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
| commit | 6f256e2d57d6814fdb97809405989c54ab148c6b (patch) | |
| tree | 0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/llcommon | |
| parent | a97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff) | |
| parent | eefe3388da83ce3e368af28ba466c27644f156c8 (diff) | |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 5 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 4 insertions, 3 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) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 6e341b83a1..c430a60ff0 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 1; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |