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

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

Ansariel 2015-03-05 15:03:50 +01:00
parent c850780718
commit 70fefb2b3a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/rlvhelper.cpp
View File

@ -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
//