5 files changed, 50 insertions, 58 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 0ceef39..099fcce 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -93,40 +93,31 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                lock (m_lock)
-                {
-                    return m_eb_uuid.Count;
-                }
+                return m_eb_uuid.Count;
             }
         }
 
         public bool ContainsKey(UUID id)
         {
-            lock (m_lock)
+            try
             {
-                try
-                {
-                    return m_eb_uuid.ContainsKey(id);
-                }
-                catch
-                {
-                    return false;
-                }
+                return m_eb_uuid.ContainsKey(id);
+            }
+            catch
+            {
+                return false;
             }
         }
 
         public bool ContainsKey(uint localID)
         {
-            lock (m_lock)
+            try
             {
-                try
-                {
-                    return m_eb_localID.ContainsKey(localID);
-                }
-                catch
-                {
-                    return false;
-                }
+                return m_eb_localID.ContainsKey(localID);
+            }
+            catch
+            {
+                return false;
             }
         }
 
@@ -136,7 +127,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 try
                 {
-                    bool a = m_eb_uuid.Remove(m_eb_localID[localID].UUID);
+                    bool a = false;
+                    EntityBase entity;
+                    if (m_eb_localID.TryGetValue(localID, out entity))
+                        a = m_eb_uuid.Remove(entity.UUID);
+
                     bool b = m_eb_localID.Remove(localID);
                     return a && b;
                 }
@@ -154,7 +149,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 try 
                 {
-                    bool a = m_eb_localID.Remove(m_eb_uuid[id].LocalId);
+                    bool a = false;
+                    EntityBase entity;
+                    if (m_eb_uuid.TryGetValue(id, out entity))
+                        a = m_eb_localID.Remove(entity.LocalId);
+
                     bool b = m_eb_uuid.Remove(id);
                     return a && b;
                 }
@@ -206,14 +205,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 lock (m_lock)
                 {
-                    try
-                    {
-                        return m_eb_uuid[id];
-                    }
-                    catch
-                    {
+                    EntityBase entity;
+                    if (m_eb_uuid.TryGetValue(id, out entity))
+                        return entity;
+                    else
                         return null;
-                    }
                 }
             }
             set
@@ -228,14 +224,11 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 lock (m_lock)
                 {
-                    try
-                    {
-                        return m_eb_localID[localID];
-                    }
-                    catch
-                    {
+                    EntityBase entity;
+                    if (m_eb_localID.TryGetValue(localID, out entity))
+                        return entity;
+                    else
                         return null;
-                    }
                 }
             }
             set
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c44c4c7..c2b9e73 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2351,12 +2351,6 @@ namespace OpenSim.Region.Framework.Scenes
                 item = InventoryService.GetItem(item);
 
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
-                IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if (ava != null)
-                {
-                    ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-                }
-
             }
             return att.UUID;
         }
@@ -2402,12 +2396,6 @@ namespace OpenSim.Region.Framework.Scenes
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = InventoryService.GetItem(item);
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
-                
-                if (m_AvatarFactory != null)
-                {
-                    m_log.InfoFormat("[SCENE INVENTORY]: Saving avatar attachment. AgentID:{0} ItemID:{1} AttachmentPoint:{2}", remoteClient.AgentId, itemID, AttachmentPt);
-                    m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-                }
             }
         }
 
@@ -2447,12 +2435,13 @@ namespace OpenSim.Region.Framework.Scenes
             if (TryGetAvatar(remoteClient.AgentId, out presence))
             {
                 presence.Appearance.DetachAttachment(itemID);
-                IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if (ava != null)
+
+                // Save avatar attachment information
+                if (m_AvatarFactory != null)
                 {
-                    ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                    m_log.Info("[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", ItemID: " + itemID);
+                    m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
-
             }
 
             m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 70b11c3..4f3cc98 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -228,6 +228,10 @@ namespace OpenSim.Region.Framework.Scenes
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
         protected IAvatarFactory m_AvatarFactory;
+        public IAvatarFactory AvatarFactory
+        {
+            get { return m_AvatarFactory; }
+        }
         protected IConfigSource m_config;
         protected IRegionSerialiserModule m_serialiser;
         protected IInterregionCommsOut m_interregionCommsOut;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 8ee26c3..e51f6ef 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -467,7 +467,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
         {
             // If we can't take it, we can't attach it!
-            //
             SceneObjectPart part = m_parentScene.GetSceneObjectPart(objectLocalID);
             if (part == null)
                 return;
@@ -477,9 +476,16 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             // Calls attach with a Zero position
-            //
             AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false);
             m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+
+            // Save avatar attachment information
+            ScenePresence presence;
+            if (m_parentScene.AvatarFactory != null && m_parentScene.TryGetAvatar(remoteClient.AgentId, out presence))
+            {
+                m_log.Info("[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", AttachmentPoint: " + AttachmentPt);
+                m_parentScene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+            }
         }
 
         public SceneObjectGroup RezSingleAttachment(
@@ -574,7 +580,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
 
-                    group.SetAttachmentPoint(Convert.ToByte(AttachmentPt));
+                    group.SetAttachmentPoint((byte)AttachmentPt);
                     group.AbsolutePosition = attachPos;
 
                     // Saves and gets itemID
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2153b9b..810dfd1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -899,7 +899,7 @@ namespace OpenSim.Region.Framework.Scenes
                 SetAttachmentPoint(Convert.ToByte(attachmentpoint));
 
                 avatar.AddAttachment(this);
-                m_log.DebugFormat("[SOG]: Added att {0} to avie {1}", UUID, avatar.UUID);
+                m_log.Debug("[SOG]: Added attachment " + UUID + " to avatar " + avatar.UUID);
 
                 if (!silent)
                 {