Merge branch 'master' of /var/git/opensim/

1 files changed, 6 insertions, 9 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 0786bd9..922eaaf 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -29,6 +29,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Security;
 using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 
@@ -81,16 +82,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get {
                 List<IAvatarAttachment> attachments = new List<IAvatarAttachment>();
                 
-                Hashtable internalAttachments = GetSP().Appearance.GetAttachments();
-                if (internalAttachments != null)
+                List<AvatarAttachment> internalAttachments = GetSP().Appearance.GetAttachments();
+                foreach (AvatarAttachment attach in internalAttachments)
                 {
-                    foreach (DictionaryEntry element in internalAttachments)
-                    {
-                        Hashtable attachInfo = (Hashtable)element.Value;
-                        attachments.Add(new SPAvatarAttachment(m_rootScene, this, (int) element.Key,
-                                                               new UUID((string) attachInfo["item"]),
-                                                               new UUID((string) attachInfo["asset"]), m_security));
-                    }
+                    attachments.Add(new SPAvatarAttachment(m_rootScene, this, attach.AttachPoint,
+                                                           new UUID(attach.ItemID),
+                                                           new UUID(attach.AssetID), m_security));
                 }
                 
                 return attachments.ToArray();