diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
| commit | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (patch) | |
| tree | 4da36d5bae02191ce86dea8b5b074b48f516a3ae /indra/newview/llvoavatarself.h | |
| parent | d53725ece11eb3403128dd77834742a1d084138f (diff) | |
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index e34f09aca2..17744cce1b 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -261,6 +261,7 @@ public: LLViewerObject* getWornAttachment(const LLUUID& inv_item_id ) const; const std::string getAttachedPointName(const LLUUID& inv_item_id) const; /*virtual*/ LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object); + void getAllAttachmentsArray(LLDynamicArray<S32>& attachments); //-------------------------------------------------------------------- // HUDs |