diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
| commit | 625dd5ead25a71cceb2973192438ae9442ed73d1 (patch) | |
| tree | 142a6613f77f6b725dd99e59ef771fefb34cf127 /indra/newview/lltexturefetch.cpp | |
| parent | 64d83571c9596900f32d0af63c2dd9968badb82f (diff) | |
| parent | f71098a4065896bd69fcfe55c83dd3a562a7ac64 (diff) | |
Merge with viewer-2-0
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; } |