Merge branch 'master' into careminster-presence-refactor

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

1 files changed, 6 insertions, 8 deletions

diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 6bec188..6ee5995 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -36,20 +36,18 @@ namespace OpenSim.Data
     {
         public UUID PrincipalID;
         public UUID ScopeID;
-        public Dictionary<string, object> Data;
+        public string FirstName;
+        public string LastName;
+        public Dictionary<string, string> Data;
     }
 
     /// <summary>
-    /// An interface for connecting to the authentication datastore
+    /// An interface for connecting to the user accounts datastore
     /// </summary>
     public interface IUserAccountData
     {
-        UserAccountData Get(UUID principalID, UUID ScopeID);
-
-        List<UserAccountData> Query(UUID principalID, UUID ScopeID, string query);
-
+        UserAccountData[] Get(string[] fields, string[] values);
         bool Store(UserAccountData data);
-
-        bool SetDataItem(UUID principalID, string item, string value);
+        UserAccountData[] GetUsers(UUID scopeID, string query);
     }
 }