1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 69202cb..27afb17 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -647,10 +647,11 @@ class LLAttachObject : public inventory_panel_listener_t
                 LLString joint_name = userdata.asString();
                 LLVOAvatar *avatarp = gAgent.getAvatarObject();
                 LLViewerJointAttachment* attachmentp = NULL;
-                for (LLViewerJointAttachment* attachment = avatarp->mAttachmentPoints.getFirstData(); 
-                        attachment;
-                        attachment = gAgent.getAvatarObject()->mAttachmentPoints.getNextData())
+                for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
+                         iter != avatarp->mAttachmentPoints.end(); )
                 {
+                        LLVOAvatar::attachment_map_t::iterator curiter = iter++;
+                        LLViewerJointAttachment* attachment = curiter->second;
                         if (attachment->getName() == joint_name)
                         {
                                 attachmentp = attachment;