summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-06-30 18:21:08 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-06-30 18:21:08 -0600
commit26b03161f5d881e8fbda5f15c6db3e0c29e7b834 (patch)
treecabf2d553a45ba75cc430893b268b1ec4f34a3ba /indra/newview/llvoavatarself.cpp
parent1596b01df60a00f9957885943ba7652dd4adce39 (diff)
fix for EXT-7839: texture console is stalled;
fix for EXT-7500: Texture Jamming problems with http texture off;
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r--indra/newview/llvoavatarself.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 982d9c375c..4edbbb7402 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1632,8 +1632,8 @@ void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_te
}
}
else
- {
- tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), type));
+ {
+ tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), type), NULL, NULL);
}
}
tex->setMinDiscardLevel(desired_discard);
@@ -2032,7 +2032,7 @@ void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTe
imagep->setBoostLevel(getAvatarBoostLevel());
imagep->resetTextureStats();
- imagep->setResetMaxVirtualSizeFlag(false) ;
+ imagep->setMaxVirtualSizeResetInterval(16);
imagep->addTextureStats( desired_pixels / texel_area_ratio );
imagep->setAdditionalDecodePriority(1.0f) ;
imagep->forceUpdateBindStats() ;