1 files changed, 41 insertions, 39 deletions

diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 92bd8ef..1bdaaab 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 
@@ -36,68 +37,69 @@ namespace OpenSim.Services.Interfaces
         {
         }
 
-        public UserAccount(UUID userID, UUID homeRegionID, float homePositionX,
-                float homePositionY, float homePositionZ, float homeLookAtX,
-                float homeLookAtY, float homeLookAtZ)
+        public UserAccount(UUID principalID)
         {
-            UserID = userID;
-            HomeRegionID = homeRegionID;
-            HomePositionX = homePositionX;
-            HomePositionY = homePositionY;
-            HomePositionZ = homePositionZ;
-            HomeLookAtX = homeLookAtX;
-            HomeLookAtY = homeLookAtY;
-            HomeLookAtZ = homeLookAtZ;
+            PrincipalID = principalID;
         }
 
         public string FirstName;
         public string LastName;
-        public UUID UserID;
+        public string Email;
+        public UUID PrincipalID;
         public UUID ScopeID;
 
-        // For informational purposes only!
-        //
-        public string HomeRegionName;
+        public Dictionary<string, object> ServiceURLs;
 
-        public UUID HomeRegionID;
-        public float HomePositionX;
-        public float HomePositionY;
-        public float HomePositionZ;
-        public float HomeLookAtX;
-        public float HomeLookAtY;
-        public float HomeLookAtZ;
+        public int Created;
 
-        // These are here because they
-        // concern the account rather than
-        // the profile. They just happen to
-        // be used in the Linden profile as well
-        //
-        public int GodLevel;
-        public int UserFlags;
-        public string AccountType;
+        public UserAccount(Dictionary<string, object> kvp)
+        {
+            if (kvp.ContainsKey("FirstName"))
+                FirstName = kvp["FirstName"].ToString();
+            if (kvp.ContainsKey("LastName"))
+                LastName = kvp["LastName"].ToString();
+            if (kvp.ContainsKey("Email"))
+                Email = kvp["Email"].ToString();
+            if (kvp.ContainsKey("PrincipalID"))
+                UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID);
+            if (kvp.ContainsKey("ScopeID"))
+                UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID);
+            if (kvp.ContainsKey("Created"))
+                Convert.ToInt32(kvp["Created"].ToString());
+            if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null && (kvp["ServiceURLs"] is Dictionary<string, string>))
+                ServiceURLs = (Dictionary<string, object>)kvp["ServiceURLs"];
+        }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result["FirstName"] = FirstName;
+            result["LastName"] = LastName;
+            result["Email"] = Email;
+            result["PrincipalID"] = PrincipalID.ToString();
+            result["ScopeID"] = ScopeID.ToString();
+            result["Created"] = Created.ToString();
+            result["ServiceURLs"] = ServiceURLs;
 
+            return result;
+        }
     };
 
     public interface IUserAccountService
     {
         UserAccount GetUserAccount(UUID scopeID, UUID userID);
         UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
+        UserAccount GetUserAccount(UUID scopeID, string Email);
         // Returns the list of avatars that matches both the search
         // criterion and the scope ID passed
         //
-        List<UserAccount> GetUserAccount(UUID scopeID, string query);
-
-
-        // This will set only the home region portion of the data!
-        // Can't be used to set god level, flags, type or change the name!
-        //
-        bool SetHomePosition(UserAccount data, UUID RegionID, UUID RegionSecret);
+        List<UserAccount> GetUserAccounts(UUID scopeID, string query);
 
         // Update all updatable fields
         //
-        bool SetUserAccount(UserAccount data, UUID PrincipalID, string token);
+        bool SetUserAccount(UserAccount data);
         
         // Creates a user data record
-        bool CreateUserAccount(UserAccount data, UUID PrincipalID, string token);
+        bool CreateUserAccount(UserAccount data);
     }
 }