diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-05-04 12:58:00 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-05-04 12:58:00 -0600 |
| commit | 402c4cc9032b17df63c2a1a0395815eff9b9f906 (patch) | |
| tree | 4f3f61d48802da12b38ed1a41e39a5916a6dd8ac /indra/llcommon | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
| parent | 32c6f92fca59698d95c067bd258b13d4c60eada3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 2629237f7e..a29e9a348e 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -404,7 +404,7 @@ void LLWorkerClass::scheduleDelete() void LLWorkerClass::setPriority(U32 priority) { mMutex.lock(); - if (mRequestHandle != LLWorkerThread::nullHandle()) + if (mRequestHandle != LLWorkerThread::nullHandle() && mRequestPriority != priority) { mRequestPriority = priority; mWorkerThread->setPriority(mRequestHandle, priority); |