diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-21 15:28:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-21 15:28:30 +0100 |
| commit | 705a42bb55b35adfb432518036535396fb3c3d82 (patch) | |
| tree | 4261a67f7f652fa4d05bc281a52816a454b997fd /indra/newview/llviewertexture.cpp | |
| parent | faa96995d359047c539d1262df0e668e2f578f94 (diff) | |
| parent | 90cd379508d41e5930e4f62f86a229d5f14c66e3 (diff) | |
merge.
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 0ad54f238e..5c262838ae 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1820,7 +1820,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) { |