summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-21 13:08:33 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-21 13:08:33 +0100
commita552660984431e738477e73025f73d59c8053c50 (patch)
treede5ea313f59c421269153e1257792cc2d0de280f /indra/newview
parent14cf6fd5a2239fc7a629e800b2e61b07e5ac238b (diff)
STORM-165 decode_priority clamp issue in texture fetching
Patch by Merov ported and reviewed by Tofu, from SG2.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewertexture.cpp2
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)
{