diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-16 21:41:31 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-16 21:41:31 +0000 |
| commit | 89d92267e233bc34fe600a07f485266e7edb2879 (patch) | |
| tree | 6b70df4f746b15024f3956c0dc9cb5fa5233f606 /indra/newview/llvoavatarself.h | |
| parent | fbddb3163824d44cfb2ceee7127ac9ed2874acab (diff) | |
svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments
This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.
Reviewed by: Vir.
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 88eb491f35..0b76d3e960 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -276,9 +276,9 @@ public: public: void updateAttachmentVisibility(U32 camera_mode); BOOL isWearingAttachment(const LLUUID& inv_item_id, BOOL include_linked_items = FALSE) const; - LLViewerObject* getWornAttachment(const LLUUID& inv_item_id ) const; + LLViewerObject* getWornAttachment(const LLUUID& inv_item_id ); const std::string getAttachedPointName(const LLUUID& inv_item_id) const; - /*virtual*/ LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); + /*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); void getAllAttachmentsArray(LLDynamicArray<S32>& attachments); //-------------------------------------------------------------------- |