1 files changed, 37 insertions, 40 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/PresenceBackreferenceEntry.cs b/OpenSim/Data/Null/NullAvatarData.cs
index 67dde6d..c81ba43 100644
--- a/OpenSim/Grid/MessagingServer.Modules/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Data/Null/NullAvatarData.cs
@@ -25,72 +25,69 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
 
-namespace OpenSim.Grid.MessagingServer.Modules
+namespace OpenSim.Data.Null
 {
-    // This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
-    public class PresenceBackreferenceEntry
+    public class NullAvatarData : IAvatarData
     {
-        List<UUID> AgentList = new List<UUID>();
+        private static Dictionary<UUID, AvatarBaseData> m_DataByUUID = new Dictionary<UUID, AvatarBaseData>();
 
-        public PresenceBackreferenceEntry()
+        public NullAvatarData(string connectionString, string realm)
         {
-
         }
 
-        public void Add(UUID item)
+        public AvatarBaseData[] Get(string field, string val)
         {
-            lock (AgentList)
+            if (field == "PrincipalID")
             {
-                AgentList.Add(item);
+                UUID id = UUID.Zero;
+                if (UUID.TryParse(val, out id))
+                    if (m_DataByUUID.ContainsKey(id))
+                        return new AvatarBaseData[] { m_DataByUUID[id] };
             }
-        }
 
-        public UUID getitem(int index)
-        {
-            UUID result = UUID.Zero;
-            lock (AgentList)
-            {
-                if (index > 0 && index < AgentList.Count)
-                {
-                    result = AgentList[index];
-                }
-            }
-            return result;
+            // Fail
+            return new AvatarBaseData[0];
         }
 
-        public int Count
+        public bool Store(AvatarBaseData data)
         {
-            get
-            {
-                int count = 0;
-                lock (AgentList)
-                {
-                    count = AgentList.Count;
-                }
-                return count;
-            }
+            m_DataByUUID[data.PrincipalID] = data;
+            return true;
         }
 
-        public void Remove(UUID item)
+        public bool Delete(UUID principalID, string name)
         {
-            lock (AgentList)
+            if (m_DataByUUID.ContainsKey(principalID) && m_DataByUUID[principalID].Data.ContainsKey(name))
             {
-                if (AgentList.Contains(item))
-                    AgentList.Remove(item);
+                    m_DataByUUID[principalID].Data.Remove(name);
+                    return true;
             }
+
+            return false;
         }
 
-        public bool contains(UUID item)
+        public bool Delete(string field, string val)
         {
-            bool result = false;
-            lock (AgentList)
+            if (field == "PrincipalID")
             {
-                result = AgentList.Contains(item);
+                UUID id = UUID.Zero;
+                if (UUID.TryParse(val, out id))
+                    if (m_DataByUUID.ContainsKey(id))
+                    {
+                        m_DataByUUID.Remove(id);
+                        return true;
+                    }
             }
-            return result;
+
+            return false;
         }
+
     }
 }