diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-23 12:56:31 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-23 12:56:31 -0700 |
| commit | 92195c479f597538a55dfa8b2e02c1b4908a2259 (patch) | |
| tree | 2af86834aa11e66f7e74057f4172d29dfd0703e7 /indra/newview/llviewertexture.cpp | |
| parent | 78e52f40424cb8336ab5d06c9ea37e16cb2b40a7 (diff) | |
| parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
Merged support for platform specific permanent quick links to the installer
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) { |