SH-4001 FIX - made local texture loading universal.

Conflicts:

	indra/newview/llvoavatarself.cpp
This commit is contained in:
Brad Payne (Vir Linden)
2013-03-22 12:21:24 -04:00
committed by Latif Khalifa
parent 20fe807271
commit 201647e1cf

View File

@@ -2622,6 +2622,11 @@ void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTe
{
if (!isIndexLocalTexture(type)) return;
// Sunshine - ignoring covered_by_baked will force local textures
// to always load. Fix for SH-4001 and many related issues. Do
// not restore this without some more targetted fix for the local
// textures failing to load issue.
//if (!covered_by_baked)
if (getLocalTextureID(type, index) != IMG_DEFAULT_AVATAR)
{
imagep->setNoDelete();