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.cpp | |
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.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 9df25bdb11..5b4a649ee1 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -990,6 +990,19 @@ LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *viewer_obj return attachment; } +void LLVOAvatarSelf::getAllAttachmentsArray(LLDynamicArray<S32>& attachments) +{ + for (LLVOAvatar::attachment_map_t::const_iterator iter = mAttachmentPoints.begin(); + iter != mAttachmentPoints.end(); ++iter) + { + LLViewerJointAttachment* attachment = iter->second; + if ( attachment && (attachment->getNumObjects() > 0)) + { + attachments.push_back(iter->first); + } + } +} + U32 LLVOAvatarSelf::getNumWearables(LLVOAvatarDefines::ETextureIndex i) const { EWearableType type = LLVOAvatarDictionary::getInstance()->getTEWearableType(i); |