summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <none@none>2009-11-12 13:40:53 -0800
committerXiaohong Bao <none@none>2009-11-12 13:40:53 -0800
commit3fe0287d122c508f686b05c5a8449a61c3ab7be2 (patch)
treea678f5729cc071d3481c8c8994e4b251ed29a36a
parenta51285994cc723ec001f3f523f41c0b86bb878d7 (diff)
do not apply additional decode priority to textures with high boost levels.
-rw-r--r--indra/newview/llviewertexture.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index fc4a2b0c0c..85bc26c9c0 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1483,9 +1483,8 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
if ( mBoostLevel > BOOST_HIGH)
{
priority += 10000000.f;
- }
-
- if(mAdditionalDecodePriority > 0.0f)
+ }
+ else if(mAdditionalDecodePriority > 0.0f)
{
// 1-9
S32 additional_priority = (S32)(1.0f + mAdditionalDecodePriority*8.0f + .5f); // round
@@ -3145,8 +3144,7 @@ F32 LLViewerMediaTexture::getMaxVirtualSize()
if(mNeedsResetMaxVirtualSize)
{
- mMaxVirtualSize = 0.f ;//reset
- mNeedsResetMaxVirtualSize = FALSE ;
+ addTextureStats(0.f, FALSE) ;//reset
}
if(mIsPlaying) //media is playing