summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-03-19 00:57:04 -0400
committerKent Quirk <q@lindenlab.com>2010-03-19 00:57:04 -0400
commit141f2aa9ee5f71134c1ac13815b7e54092ee4756 (patch)
tree521dcdefd4a260b68425b44498e190710de9c0d4 /indra/newview/llviewertexture.cpp
parent599c2d7475382e234ead5c912c64cdfd9610db54 (diff)
parent7b7114f7ac27b67c6e75d8f1ecc7596bc88c78de (diff)
Merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index dbbf0219c9..9fbffdac35 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1546,8 +1546,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
}
else
{
- // Leave the priority as-is
- return mDecodePriority;
+ priority = -1.f; //stop fetching
}
}
else if (cur_discard < 0)