From 726a26d4bc3b66dafbc8bdfe238c52a0eff23a74 Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Fri, 30 Aug 2013 19:05:23 -0400 Subject: SH-4458 FIX "Pant flares rendering as tights after SSA rollout" probably not related to SSA rollout, but we were not triggering the callbacks for baked texture loads, since the avatar object was adding paused callbacks to the callback list without properly setting the flag to indicate paused callbacks. --- indra/newview/llvoavatar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7909570883..0bd51d9c15 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6328,6 +6328,9 @@ void LLVOAvatar::updateMeshTextures() } baked_img->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ), src_callback_list, paused ); + + // this could add paused texture callbacks + mLoadedCallbacksPaused |= paused; } } else if (layerset && isUsingLocalAppearance()) @@ -6677,6 +6680,9 @@ void LLVOAvatar::onFirstTEMessageReceived() LL_DEBUGS("Avatar") << avString() << "layer_baked, setting onInitialBakedTextureLoaded as callback" << LL_ENDL; image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ), src_callback_list, paused ); + + // this could add paused texture callbacks + mLoadedCallbacksPaused |= paused; } } -- cgit v1.2.3