diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 19:14:29 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 19:14:29 +0000 |
| commit | 2a392edbcc73b819b8ffb24705a6bdddb491f275 (patch) | |
| tree | 9808740bf3042b083ec04e90c3a7396751b95650 /indra/newview/lltexturefetch.cpp | |
| parent | 1852382e45f3f1ce97686dcbe72300cab8eff465 (diff) | |
| parent | 9b7615c906aaee7fac6c7a9c5eb706b7f6c845fb (diff) | |
merge.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 6c35464a51..0053ce8df8 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -491,7 +491,7 @@ U32 LLTextureFetchWorker::calcWorkPriority() //llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerFetchedTexture::maxDecodePriority()); static const F32 PRIORITY_SCALE = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority(); - mWorkPriority = (U32)(mImagePriority * PRIORITY_SCALE); + mWorkPriority = llmin((U32)LLWorkerThread::PRIORITY_LOWBITS, (U32)(mImagePriority * PRIORITY_SCALE)); return mWorkPriority; } |