diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-08 17:53:32 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-08 17:53:32 -0400 |
| commit | 6f2118432d2753ef46df9c15a78267127191e110 (patch) | |
| tree | 94e43d37fbc4df9f522b53bc6379e2d54b87db58 /indra/newview/llappearancemgr.cpp | |
| parent | 19bb6f489aeac44b622c190ccaf9310af3b53208 (diff) | |
EXT-8279 FIX original items being deleted when removed from COF
Replacing logic with call to removeCOFItemLinks, which should do appropriate
checking to determine that item is in the COF and is actually a link.
Code reviewed by Seraph
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 862c68ecda..6aa2d19c12 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2502,12 +2502,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) |