diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-08 17:53:48 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-08 17:53:48 -0400 |
| commit | adfa188ceea432edf889d50e2c86bbc9ead9c71d (patch) | |
| tree | 81ac640b302c05d3ceadb3d99752f3a593fb5bb3 /indra | |
| parent | aea47535b4e2417663c1114e32c3b24b0d43c137 (diff) | |
| parent | 6f2118432d2753ef46df9c15a78267127191e110 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra')
| -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 f4dbac5c0e..43f6be42b6 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -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) |