[Appearance/Misc]

- fixed : Add to/Replace Outfit removes newly worn attachments on completion
    -> (partial) fix for http://jira.secondlife.com/browse/VWR-18512
    -> copies over from RLVa since it's really just a viewer (appearance) bug

--HG--
branch : Appearance-Misc

indra/newview/llappearancemgr.cpp

@@ -291,8 +291,13 @@ public:
 	
 private:
 	found_list_t mFoundList;
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+	// Fix for http://jira.secondlife.com/browse/VWR-18512
+/*
 	LLInventoryModel::item_array_t mObjItems;
 	LLInventoryModel::item_array_t mGestItems;
+*/
+// [/SL:KB]
 	typedef std::set<S32> type_set_t;
 	type_set_t mTypesToRecover;
 	type_set_t mTypesToLink;
@@ -357,6 +362,9 @@ void LLWearableHoldingPattern::eraseTypeToRecover(LLWearableType::EType type)
 	mTypesToRecover.erase(type);
 }
 
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-06-19 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+// Fix for http://jira.secondlife.com/browse/VWR-18512
+/*
 void LLWearableHoldingPattern::setObjItems(const LLInventoryModel::item_array_t& items)
 {
 	mObjItems = items;
@@ -366,6 +374,8 @@ void LLWearableHoldingPattern::setGestItems(const LLInventoryModel::item_array_t
 {
 	mGestItems = items;
 }
+*/
+// [/SL:KB]
 
 bool LLWearableHoldingPattern::isFetchCompleted()
 {
@@ -435,6 +445,9 @@ void LLWearableHoldingPattern::onAllComplete()
 	}
 
 	// Activate all gestures in this folder
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+	// Fix for http://jira.secondlife.com/browse/VWR-18512
+/*
 	if (mGestItems.count() > 0)
 	{
 		llinfos << "Activating " << mGestItems.count() << " gestures" << llendl;
@@ -452,11 +465,16 @@ void LLWearableHoldingPattern::onAllComplete()
 			gInventory.notifyObservers();
 		}
 	}
+*/
+// [/SL:KB]
 
 	// Update wearables.
 	llinfos << "Updating agent wearables with " << mResolved << " wearable items " << llendl;
 	LLAppearanceMgr::instance().updateAgentWearables(this, false);
 	
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+	// Fix for http://jira.secondlife.com/browse/VWR-18512
+/*
 	// Update attachments to match those requested.
 //	if (isAgentAvatarValid())
 // [SL:KB] - Patch: Appearance-Misc | Checked: 2010-08-14 (Catznip-2.1.2a) | Modified: Catznip-2.1.1d
@@ -467,6 +485,8 @@ void LLWearableHoldingPattern::onAllComplete()
 		llinfos << "Updating " << mObjItems.count() << " attachments" << llendl;
 		LLAgentWearables::userUpdateAttachments(mObjItems);
 	}
+*/
+// [/SL:KB]
 
 	if (isFetchCompleted() && isMissingCompleted())
 	{
@@ -1708,11 +1728,49 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
 	//preparing the list of wearables in the correct order for LLAgentWearables
 	sortItemsByActualDescription(wear_items);
 
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+	// Fix for http://jira.secondlife.com/browse/VWR-18512 [code below copied from LLWearableHoldingPattern::pollCompletion()]
+
+	// Activate all gestures in this folder
+	if (gest_items.count() > 0)
+	{
+		llinfos << "Activating " << gest_items.count() << " gestures" << llendl;
+		
+		LLGestureMgr::instance().activateGestures(gest_items);
+		
+		// Update the inventory item labels to reflect the fact
+		// they are active.
+		LLViewerInventoryCategory* catp =
+			gInventory.getCategory(LLAppearanceMgr::instance().getCOF());
+		
+		if (catp)
+		{
+			gInventory.updateCategory(catp);
+			gInventory.notifyObservers();
+		}
+	}
+
+	// Update attachments to match those requested.
+//	if (isAgentAvatarValid())
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-08-14 (Catznip-2.1.2a) | Modified: Catznip-2.1.1d
+	// Don't update attachments until initial wearables have loaded (should reduce random attaching/detaching/reattaching at log-on)
+	if ( (isAgentAvatarValid()) && (gAgentWearables.areInitalWearablesLoaded()) )
+// [/SL:KB]
+	{
+		llinfos << "Updating " << obj_items.count() << " attachments" << llendl;
+		LLAgentWearables::userUpdateAttachments(obj_items);
+	}
+// [/SL:KB]
 
 	LLWearableHoldingPattern* holder = new LLWearableHoldingPattern;
 
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1.2a) | Added: Catznip-2.1.2a
+	// Fix for http://jira.secondlife.com/browse/VWR-18512
+/*
 	holder->setObjItems(obj_items);
 	holder->setGestItems(gest_items);
+*/
+// [/SL:KB]
 		
 	// Note: can't do normal iteration, because if all the
 	// wearables can be resolved immediately, then the