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

Automated merge with ssh://hg.lindenlab.com/q/viewer-release/

master
Nyx (Neal Orman) 2010-07-08 17:53:48 -04:00
parent aea47535b4 6f2118432d
commit adfa188cee
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llappearancemgr.cpp
View File

@ -2507,12 +2507,7 @@ void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove)
// since sever don't sends message _PREHASH_KillObject in that case.
// Also we can't check is link was successfully removed from COF since in case
// deleting attachment link removing performs asynchronously in process_kill_object callback.
LLViewerInventoryItem* item = gInventory.getItem(id_to_remove);
if (item != NULL)
{
gInventory.purgeObject(id_to_remove);
gInventory.notifyObservers();
}
removeCOFItemLinks(id_to_remove,false);
}
bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_body)