nyx avatar nyx committed b3fc016 Merge

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

Comments (0)

Files changed (1)

indra/newview/llappearancemgr.cpp

 	// 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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.