From 267f18925d06ca05e2a5ffbfbb63582783762439 Mon Sep 17 00:00:00 2001
From: Master ScienceSim
Date: Thu, 21 Oct 2010 16:48:58 -0700
Subject: First attempt to get multiple attachments working to support viewer2.
 The attachment code appears to work correctly for 1.23 viewers so, in spite
 of some big changes in the internal representation, there don't appear to be
 regressions. That being said, I still can't get a viewer2 avatar to show
 correctly.

---
 OpenSim/Services/Interfaces/IAvatarService.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Services/Interfaces/IAvatarService.cs')

diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 93b977b..eaa6534 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -178,17 +178,11 @@ namespace OpenSim.Services.Interfaces
             Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString();
 
             // Attachments
-            Hashtable attachs = appearance.GetAttachments();
-            if (attachs != null)
-                foreach (DictionaryEntry dentry in attachs)
-                {
-                    if (dentry.Value != null)
-                    {
-                        Hashtable tab = (Hashtable)dentry.Value;
-                        if (tab.ContainsKey("item") && tab["item"] != null)
-                            Data["_ap_" + dentry.Key] = tab["item"].ToString();
-                    }
-                }
+            List<AvatarAttachment> attachments = appearance.GetAttachments();
+            foreach (AvatarAttachment attach in attachments)
+            {
+                Data["_ap_" + attach.AttachPoint] = attach.ItemID.ToString();
+            }
         }
 
         public AvatarAppearance ToAvatarAppearance(UUID owner)
-- 
cgit v1.1