From 70fefb2b3af81ec340611b4ad8273cff1cd8280f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 5 Mar 2015 15:03:50 +0100
Subject: [PATCH] After further discussion with Drake, partially undo previous
 commit and only batch wearables for now as attachments might need some
 special care in terms of RLV

---
 indra/newview/rlvhelper.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 2d45192d15..3ae2f267e1 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -913,15 +913,15 @@ void RlvForceWear::done()
 	// Process removals
 	//
 
-	uuid_vec_t ids_to_remove;
-
 	// Wearables
+	uuid_vec_t ids_to_remove;
 	if (m_remWearables.size())
 	{
 		for (std::list<const LLViewerWearable*>::const_iterator itWearable = m_remWearables.begin(); itWearable != m_remWearables.end(); ++itWearable)
 			ids_to_remove.push_back((*itWearable)->getItemID());
 		m_remWearables.clear();
 	}
+	pAppearanceMgr->removeItemsFromAvatar(ids_to_remove);
 
 	// Gestures
 	if (m_remGestures.size())
@@ -941,14 +941,12 @@ void RlvForceWear::done()
 		for (std::vector<LLViewerObject*>::const_iterator itAttachObj = m_remAttachments.begin(); 
 				itAttachObj != m_remAttachments.end(); ++itAttachObj)
 		{
-			ids_to_remove.push_back((*itAttachObj)->getAttachmentItemID());
+			pAppearanceMgr->removeCOFItemLinks((*itAttachObj)->getAttachmentItemID());
 		}
 
 		m_remAttachments.clear();
 	}
 
-	pAppearanceMgr->removeItemsFromAvatar(ids_to_remove);
-
 	//
 	// Process additions
 	//