diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
| commit | b302f15deea0f4f7f5de75bfd3776c17021b6444 (patch) | |
| tree | 7a2842445c8dd6c8537bd9f8d4d171e95b85a845 /indra/newview/llviewerobjectlist.cpp | |
| parent | 6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (diff) | |
EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 38efb5de11..012bdb0843 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1157,11 +1157,11 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce LLVOAvatar* avatarp = gAgent.getAvatarObject(); if (avatarp) { - LLViewerJointAttachment* attachmentp; - for (attachmentp = avatarp->mAttachmentPoints.getFirstData(); - attachmentp; - attachmentp = avatarp->mAttachmentPoints.getNextData()) + for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); + iter != avatarp->mAttachmentPoints.end(); ) { + LLVOAvatar::attachment_map_t::iterator curiter = iter++; + LLViewerJointAttachment* attachmentp = curiter->second; if (attachmentp->getIsHUDAttachment()) { LLViewerObject* objectp = attachmentp->getObject(); |