summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-19 14:22:40 -0700
committerRichard Nelson <none@none>2010-03-19 14:22:40 -0700
commit8992f058e077a78d091c864619d9d740dc305094 (patch)
tree7d77fbc4451a4eb8b211292a44b8003cb51fdf01 /indra/newview/llviewertexture.cpp
parentfd096e5011c8d777f54c7fe473b12e6730dbedc0 (diff)
parentf50be64167c254e27f635ad47d8940551f0c6ab4 (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)