From ef63c80766811a86d8ea6ed90d409b6451744e6b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 23 Nov 2009 11:46:15 -0500 Subject: EXT-2535 wearables created in 2.0 don't load in 1.23 Re-opening issue for a second pass at it. This pass updates the code that was intended to make all loaded wearables auto-save themselves back to wearable version 22 (from 24). Code was not being hit, so relocated it to after wearable had been added to llagentwearables to ensure the save succeeded. Will be post-reviewed before push. --HG-- branch : avatar-pipeline --- indra/newview/llwearable.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'indra/newview/llwearable.cpp') diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index ced0b64896..d92da4ef44 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -421,18 +421,6 @@ BOOL LLWearable::importFile( LLFILE* file ) // copy all saved param values to working params revertValues(); - // Hack pt 2. If the wearable we just loaded has definition version 24, - // then force a re-save of this wearable after slamming the version number to 22. - // This number was incorrectly incremented for internal builds before release, and - // this fix will ensure that the affected wearables are re-saved with the right version number. - // the versions themselves are compatible. This code can be removed before release. - if( mDefinitionVersion == 24 ) - { - mDefinitionVersion = 22; - U32 index = gAgentWearables.getWearableIndex(this); - gAgentWearables.saveWearable(mType,index,TRUE); - } - return TRUE; } -- cgit v1.2.3