diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IUserService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IUserService.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs index e4e4bec..1bdaaab 100644 --- a/OpenSim/Services/Interfaces/IUserService.cs +++ b/OpenSim/Services/Interfaces/IUserService.cs | |||
@@ -37,20 +37,20 @@ namespace OpenSim.Services.Interfaces | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | public UserAccount(UUID userID) | 40 | public UserAccount(UUID principalID) |
41 | { | 41 | { |
42 | UserID = userID; | 42 | PrincipalID = principalID; |
43 | } | 43 | } |
44 | 44 | ||
45 | public string FirstName; | 45 | public string FirstName; |
46 | public string LastName; | 46 | public string LastName; |
47 | public string Email; | 47 | public string Email; |
48 | public UUID UserID; | 48 | public UUID PrincipalID; |
49 | public UUID ScopeID; | 49 | public UUID ScopeID; |
50 | 50 | ||
51 | public Dictionary<string, object> ServiceURLs; | 51 | public Dictionary<string, object> ServiceURLs; |
52 | 52 | ||
53 | public DateTime Created; | 53 | public int Created; |
54 | 54 | ||
55 | public UserAccount(Dictionary<string, object> kvp) | 55 | public UserAccount(Dictionary<string, object> kvp) |
56 | { | 56 | { |
@@ -60,12 +60,12 @@ namespace OpenSim.Services.Interfaces | |||
60 | LastName = kvp["LastName"].ToString(); | 60 | LastName = kvp["LastName"].ToString(); |
61 | if (kvp.ContainsKey("Email")) | 61 | if (kvp.ContainsKey("Email")) |
62 | Email = kvp["Email"].ToString(); | 62 | Email = kvp["Email"].ToString(); |
63 | if (kvp.ContainsKey("UserID")) | 63 | if (kvp.ContainsKey("PrincipalID")) |
64 | UUID.TryParse(kvp["UserID"].ToString(), out UserID); | 64 | UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID); |
65 | if (kvp.ContainsKey("ScopeID")) | 65 | if (kvp.ContainsKey("ScopeID")) |
66 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); | 66 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); |
67 | if (kvp.ContainsKey("Created")) | 67 | if (kvp.ContainsKey("Created")) |
68 | DateTime.TryParse(kvp["Created"].ToString(), out Created); | 68 | Convert.ToInt32(kvp["Created"].ToString()); |
69 | if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null && (kvp["ServiceURLs"] is Dictionary<string, string>)) | 69 | if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null && (kvp["ServiceURLs"] is Dictionary<string, string>)) |
70 | ServiceURLs = (Dictionary<string, object>)kvp["ServiceURLs"]; | 70 | ServiceURLs = (Dictionary<string, object>)kvp["ServiceURLs"]; |
71 | } | 71 | } |
@@ -76,7 +76,7 @@ namespace OpenSim.Services.Interfaces | |||
76 | result["FirstName"] = FirstName; | 76 | result["FirstName"] = FirstName; |
77 | result["LastName"] = LastName; | 77 | result["LastName"] = LastName; |
78 | result["Email"] = Email; | 78 | result["Email"] = Email; |
79 | result["UserID"] = UserID.ToString(); | 79 | result["PrincipalID"] = PrincipalID.ToString(); |
80 | result["ScopeID"] = ScopeID.ToString(); | 80 | result["ScopeID"] = ScopeID.ToString(); |
81 | result["Created"] = Created.ToString(); | 81 | result["Created"] = Created.ToString(); |
82 | result["ServiceURLs"] = ServiceURLs; | 82 | result["ServiceURLs"] = ServiceURLs; |