diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 12:53:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 12:53:53 +0100 |
| commit | 98870dfa245c68dc1de155162afc77c1a8cefcd0 (patch) | |
| tree | d2b59ec8a535f12b1d929b51ba6ad7e72950c177 /indra/newview/llvoavatarself.cpp | |
| parent | 6cab04ce2fcbcff87b5b3b8d3387b9d812dc53d3 (diff) | |
| parent | 6c79b8460027acf18bc40fb357a2b13ec86a1ccf (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index bddde08ca9..95402c2e06 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1067,7 +1067,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view // Should just be the last object added if (attachment->isObjectAttached(viewer_object)) { - const LLUUID& attachment_id = viewer_object->getItemID(); + const LLUUID& attachment_id = viewer_object->getAttachmentItemID(); LLAppearanceMgr::instance().registerAttachment(attachment_id); } @@ -1077,7 +1077,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view //virtual BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) { - const LLUUID attachment_id = viewer_object->getItemID(); + const LLUUID attachment_id = viewer_object->getAttachmentItemID(); if (LLVOAvatar::detachObject(viewer_object)) { // the simulator should automatically handle permission revocation |