diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-03 12:53:40 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-03 12:53:40 -0500 |
commit | 8f6b28d89f1b680db0c17cea680f1a184f298583 (patch) | |
tree | 73d05fac4f1ae001261a4ecd9093a2e7de0592f8 /indra/newview/llvoavatarself.cpp | |
parent | da3f4c402dd95e52186309af925b41ee946ef3dc (diff) | |
parent | 9109809fb18968edfcd8e8f01428309fcc2e7578 (diff) |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 44fd81f0d1..a964f43171 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1081,15 +1081,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view { const LLUUID& attachment_id = viewer_object->getItemID(); LLAppearanceManager::registerAttachment(attachment_id); - LLViewerInventoryItem *item = gInventory.getItem(attachment_id); - if (item) - { - LLAppearanceManager::dumpCat(LLAppearanceManager::getCOF(),"Adding attachment link:"); - LLAppearanceManager::wearItem(item,false); // Add COF link for item. - gInventory.addChangedMask(LLInventoryObserver::LABEL, attachment_id); - } } - gInventory.notifyObservers(); return attachment; } @@ -1127,14 +1119,9 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) } else { - LLAppearanceManager::dumpCat(LLAppearanceManager::getCOF(),"Removing attachment link:"); - LLAppearanceManager::removeItemLinks(attachment_id, false); LLAppearanceManager::unregisterAttachment(attachment_id); } - // BAP - needs to change for label to track link. - gInventory.addChangedMask(LLInventoryObserver::LABEL, attachment_id); - gInventory.notifyObservers(); return TRUE; } return FALSE; |