From b302f15deea0f4f7f5de75bfd3776c17021b6444 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 1 Feb 2008 02:23:35 +0000
Subject: EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release ACTUAL
 MERGE: merge maint-viewer-3-merge -r 79051 -> release

---
 indra/newview/llviewerobjectlist.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llviewerobjectlist.cpp')

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();
-- 
cgit v1.2.3