From 201647e1cfda0f2698fd8db5ad3dd837636ec0d5 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 22 Mar 2013 12:21:24 -0400 Subject: [PATCH] SH-4001 FIX - made local texture loading universal. Conflicts: indra/newview/llvoavatarself.cpp --- indra/newview/llvoavatarself.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 9906dc117..8162afcf0 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -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();