diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
| commit | b6e7850c0a3d65ed0a1501e19a1655055000e32f (patch) | |
| tree | 553d336a12691fb1c1caebc0e1979fc3567b02b7 /indra/newview/llvoavatarself.cpp | |
| parent | 58d76a9ecf83b49e42fabfada27ca20814f93cf3 (diff) | |
| parent | b2a667b7222640a384cb23763b32f8746b0c8cd8 (diff) | |
Merge
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 74ee6a05d9..d58be21910 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1055,7 +1055,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view if (attachment->isObjectAttached(viewer_object)) { const LLUUID& attachment_id = viewer_object->getItemID(); - LLAppearanceManager::instance().registerAttachment(attachment_id); + LLAppearanceMgr::instance().registerAttachment(attachment_id); } return attachment; @@ -1094,7 +1094,7 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) } else { - LLAppearanceManager::instance().unregisterAttachment(attachment_id); + LLAppearanceMgr::instance().unregisterAttachment(attachment_id); } return TRUE; |