1 files changed, 15 insertions, 6 deletions

diff --git a/OpenSim/Grid/Framework/IMessagingServerDiscovery.cs b/OpenSim/Data/IAvatarData.cs
index c996f4f..0a18e21 100644
--- a/OpenSim/Grid/Framework/IMessagingServerDiscovery.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -27,14 +27,23 @@
 
 using System;
 using System.Collections.Generic;
-using OpenSim.Framework.Servers;
+using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.Grid.Framework
+namespace OpenSim.Data
 {
-    public interface IMessagingServerDiscovery
+    // This MUST be a ref type!
+    public class AvatarBaseData
     {
-        List<MessageServerInfo> GetMessageServersList();
-        void RegisterMessageServer(MessageServerInfo m);
-        void DeRegisterMessageServer(MessageServerInfo m);
+        public UUID PrincipalID;
+        public Dictionary<string, string> Data;
+    }
+
+    public interface IAvatarData 
+    {
+        AvatarBaseData[] Get(string field, string val);
+        bool Store(AvatarBaseData data);
+        bool Delete(UUID principalID, string name);
+        bool Delete(string field, string val);
     }
 }