From 8112ba5bafe404a43a22a57eb0aa96d884fab365 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 15 Mar 2010 12:08:57 -0400 Subject: EXT-6010 Appearance reverts to an old outfit while attempting to wear new outfit Added code to suppress local composite updates while wearables are loaded. This makes sure that we don't update your appearance until all your wearables are added to gAgentWearables. Hackish for 2.0, but will be inherently better for 2.1 code reviewed by vir. --- indra/newview/llwearable.cpp | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'indra/newview/llwearable.cpp') diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index acfbc23f62..e7eda76433 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -56,6 +56,37 @@ using namespace LLVOAvatarDefines; // static S32 LLWearable::sCurrentDefinitionVersion = 1; +// support class - remove for 2.1 (hackity hack hack) +class LLOverrideBakedTextureUpdate +{ +public: + LLOverrideBakedTextureUpdate(bool temp_state) + { + mAvatar = gAgent.getAvatarObject(); + U32 num_bakes = (U32) LLVOAvatarDefines::BAKED_NUM_INDICES; + for( U32 index = 0; index < num_bakes; ++index ) + { + composite_enabled[index] = mAvatar->isCompositeUpdateEnabled(index); + } + mAvatar->setCompositeUpdatesEnabled(temp_state); + llinfos << "suprress baked texture update initialized to " << temp_state << llendl; + } + + ~LLOverrideBakedTextureUpdate() + { + U32 num_bakes = (U32)LLVOAvatarDefines::BAKED_NUM_INDICES; + for( U32 index = 0; index < num_bakes; ++index ) + { + mAvatar->setCompositeUpdatesEnabled(index, composite_enabled[index]); + } + llinfos << "suppress baked texture update reverted " << llendl; + } + +private: + bool composite_enabled[LLVOAvatarDefines::BAKED_NUM_INDICES]; + LLVOAvatarSelf *mAvatar; +}; + // Private local functions static std::string terse_F32_to_string(F32 f); static std::string asset_id_to_filename(const LLUUID &asset_id); @@ -216,6 +247,10 @@ BOOL LLWearable::importFile( LLFILE* file ) char text_buffer[2048]; /* Flawfinder: ignore */ S32 fields_read = 0; + // suppress texlayerset updates while wearables are being imported. Layersets will be updated + // when the wearables are "worn", not loaded. Note state will be restored when this object is destroyed. + LLOverrideBakedTextureUpdate stop_bakes(false); + // read header and version fields_read = fscanf( file, "LLWearable version %d\n", &mDefinitionVersion ); if( fields_read != 1 ) -- cgit v1.2.3 From 00f278568230c9cf3a438e9026dc3c387d8ac134 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 15 Mar 2010 14:11:25 -0400 Subject: EXT-6010 apperance reverts to an old outfit while attempting to wear new outfit Removing log spam before pushing to main branch. change is de minimis. -Nyx --- indra/newview/llwearable.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llwearable.cpp') diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index e7eda76433..3334c17a8f 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -69,7 +69,6 @@ public: composite_enabled[index] = mAvatar->isCompositeUpdateEnabled(index); } mAvatar->setCompositeUpdatesEnabled(temp_state); - llinfos << "suprress baked texture update initialized to " << temp_state << llendl; } ~LLOverrideBakedTextureUpdate() @@ -79,7 +78,6 @@ public: { mAvatar->setCompositeUpdatesEnabled(index, composite_enabled[index]); } - llinfos << "suppress baked texture update reverted " << llendl; } private: -- cgit v1.2.3