summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-07-19 15:09:52 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-07-19 15:09:52 -0600
commit478edbee8c7f6596174c7cde781c849c2ab51aa8 (patch)
tree0c7d2d0e44cd895d3a7974b14edae0b464fa5d27 /indra
parent565d5dc1a9a4617874710ce7ede82a30c203f03f (diff)
EXT-7400: FIXED: 2.0.2 texture queue gets jammed
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewertexture.cpp1
-rw-r--r--indra/newview/llwearable.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 928525244c..7bd5004a05 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1615,6 +1615,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
S32 ddiscard = MAX_DISCARD_LEVEL - (S32)desired;
ddiscard = llclamp(ddiscard, 0, MAX_DELTA_DISCARD_LEVEL_FOR_PRIORITY);
priority = (ddiscard + 1) * PRIORITY_DELTA_DISCARD_LEVEL_FACTOR;
+ setAdditionalDecodePriority(1.0f) ;//boost the textures without any data so far.
}
else if ((mMinDiscardLevel > 0) && (cur_discard <= mMinDiscardLevel))
{
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index 401e2cdb1b..dfa7ca7136 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -444,7 +444,6 @@ BOOL LLWearable::importFile( LLFILE* file )
delete mSavedTEMap[te];
}
- image->setBoostLevel(LLViewerTexture::BOOST_AVATAR_SELF) ;
image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), NULL);
LLUUID textureid(text_buffer);