From bc91053543278b56d7009ab6bbcdee88a0ee1418 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 16 Jun 2010 15:26:53 -0400
Subject: EXT-6571 FIX - avoid removing links to missing wearables, which fixes
 a problem with ordering in multi-wearables

---
 indra/newview/llappearancemgr.cpp                     | 19 ++++++++++++++++---
 .../skins/default/xui/en/panel_outfits_inventory.xml  |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 3c267b3308..1ce5206e89 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -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.
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index c1e5ae50e6..a59070496e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -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>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3