diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-06-24 21:36:42 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-06-24 21:36:42 +0000 |
| commit | a00af78b95a62c613f9a2ac4a28a0017086c5ffa (patch) | |
| tree | 25c46a6508a77d9b250fe166d7b0692983dc98f2 /indra/newview/llvoavatarself.h | |
| parent | 2ce76c7ed47b49f8a7bafe69bdea064189e1ccbd (diff) | |
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 431c814382..02a77cba90 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -267,7 +267,7 @@ public: //-------------------------------------------------------------------- public: void updateAttachmentVisibility(U32 camera_mode); - BOOL isWearingAttachment(const LLUUID& inv_item_id); + BOOL isWearingAttachment(const LLUUID& inv_item_id, BOOL include_linked_items = FALSE) const; LLViewerObject* getWornAttachment(const LLUUID& inv_item_id ) const; const std::string getAttachedPointName(const LLUUID& inv_item_id) const; /*virtual*/ LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); |