diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-21 10:50:34 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-21 10:50:34 -0400 |
| commit | 3a1f0ef173e5853f20aed93c741a9f74637d7d36 (patch) | |
| tree | a777b8671ceb5d9a8916a72a4d31c0e45309bead /indra/newview/llviewertexture.cpp | |
| parent | 9b16a05c07372d2d86be0be1b914086984ea5285 (diff) | |
| parent | 90cd379508d41e5930e4f62f86a229d5f14c66e3 (diff) | |
Automated merge from viewer-development-shining
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 4e7ac195ee..7ccd4828ba 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1823,7 +1823,7 @@ bool LLViewerFetchedTexture::updateFetch() S32 current_discard = getCurrentDiscardLevelForFetching() ; S32 desired_discard = getDesiredDiscardLevel(); F32 decode_priority = getDecodePriority(); - decode_priority = llmax(decode_priority, 0.0f); + decode_priority = llclamp(decode_priority, 0.0f, maxDecodePriority()); if (mIsFetching) { |