livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-6571 FIX - avoid removing links to missing wearables, which fixes a problem with ordering in multi-wearables

meow-7.2.2
Brad Payne (Vir Linden) 2010-06-16 15:26:53 -04:00
parent 9ee5a62332
commit bc91053543
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llappearancemgr.cpp
View File

@ -652,7 +652,15 @@ bool LLWearableHoldingPattern::pollMissingWearables()
if (done)
{
gAgentAvatarp->debugWearablesLoaded();
clearCOFLinksForMissingWearables();
// BAP - if we don't call clearCOFLinksForMissingWearables()
// here, we won't have to add the link back in later if the
// wearable arrives late. This is to avoid corruption of
// wearable ordering info. Also has the effect of making
// unworn item links visible in the COF under some
// circumstances.
//clearCOFLinksForMissingWearables();
onAllComplete();
}
return done;
@ -698,8 +706,13 @@ void LLWearableHoldingPattern::handleLateArrivals()
data.mWearable = wearable;
replaced_types.insert(data.mWearableType);
LLAppearanceMgr::instance().addCOFItemLink(data.mItemID,false);
// BAP - if we didn't call
// clearCOFLinksForMissingWearables() earlier, we
// don't need to restore the link here. Fixes
// wearable ordering problems.
// LLAppearanceMgr::instance().addCOFItemLink(data.mItemID,false);
// BAP failing this means inventory or asset server
// are corrupted in a way we don't handle.

4
indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
View File

@ -48,7 +48,7 @@
mouse_opaque="true"
name="cof_tab"
start_folder="Current Outfit"
use_label_suffix="false"
use_label_suffix="true"
width="315" />
</tab_container>
<panel
@ -130,4 +130,4 @@
width="152" />
</panel>
</panel>
</panel>