Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested

1 files changed, 14 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs b/OpenSim/Data/IAvatarData.cs
index 5f9129d..0a18e21 100644
--- a/OpenSim/Region/Framework/Interfaces/ITeleportModule.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -27,15 +27,23 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework;
 
-namespace OpenSim.Region.Framework.Interfaces
+namespace OpenSim.Data
 {
-    public interface ITeleportModule
+    // This MUST be a ref type!
+    public class AvatarBaseData
     {
-        void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
-                                                      Vector3 lookAt, uint teleportFlags);
+        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);
     }
 }