diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-09 12:53:50 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-09 12:53:50 -0800 |
| commit | 89df03e8ccada96b691bba938f9df14bf5cfe382 (patch) | |
| tree | bdeff7db79e1786ba1da41a3dcee031bcedf078a /indra/newview/lltexturefetch.cpp | |
| parent | 9a19daccd0a8a711ce01b140febf5fc632df0e57 (diff) | |
| parent | 13e395aef2225601124d1df3ec4764859e8718f5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index bdc196e16c..4a61130785 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -488,8 +488,9 @@ void LLTextureFetchWorker::setupPacketData() U32 LLTextureFetchWorker::calcWorkPriority() { -// llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerTexture::maxDecodePriority()); - static F32 PRIORITY_SCALE = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority(); + //llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerFetchedTexture::maxDecodePriority()); + static const F32 PRIORITY_SCALE = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority(); + mWorkPriority = (U32)(mImagePriority * PRIORITY_SCALE); return mWorkPriority; } |