diff options
author | Diva Canto | 2010-01-10 10:40:07 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 10:40:07 -0800 |
commit | 1e1b2ab221851efc414678b7ea52ef2ca788ce9f (patch) | |
tree | 29b6aa80e54a9c18529ae14e7d185fe67582d151 /OpenSim/Services/Interfaces/IUserAccountService.cs | |
parent | Add a "LockedOut" flag to allow locking a region out via the grid server. (diff) | |
download | opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2 opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz |
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to 'OpenSim/Services/Interfaces/IUserAccountService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IUserAccountService.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs index b1be64b..942174c 100644 --- a/OpenSim/Services/Interfaces/IUserAccountService.cs +++ b/OpenSim/Services/Interfaces/IUserAccountService.cs | |||
@@ -58,11 +58,19 @@ namespace OpenSim.Services.Interfaces | |||
58 | public string Email; | 58 | public string Email; |
59 | public UUID PrincipalID; | 59 | public UUID PrincipalID; |
60 | public UUID ScopeID; | 60 | public UUID ScopeID; |
61 | public int UserLevel; | ||
62 | public int UserFlags; | ||
63 | public string UserTitle; | ||
61 | 64 | ||
62 | public Dictionary<string, object> ServiceURLs; | 65 | public Dictionary<string, object> ServiceURLs; |
63 | 66 | ||
64 | public int Created; | 67 | public int Created; |
65 | 68 | ||
69 | public string Name | ||
70 | { | ||
71 | get { return FirstName + " " + LastName; } | ||
72 | } | ||
73 | |||
66 | public UserAccount(Dictionary<string, object> kvp) | 74 | public UserAccount(Dictionary<string, object> kvp) |
67 | { | 75 | { |
68 | if (kvp.ContainsKey("FirstName")) | 76 | if (kvp.ContainsKey("FirstName")) |
@@ -75,6 +83,13 @@ namespace OpenSim.Services.Interfaces | |||
75 | UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID); | 83 | UUID.TryParse(kvp["PrincipalID"].ToString(), out PrincipalID); |
76 | if (kvp.ContainsKey("ScopeID")) | 84 | if (kvp.ContainsKey("ScopeID")) |
77 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); | 85 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); |
86 | if (kvp.ContainsKey("UserLevel")) | ||
87 | Convert.ToInt32(kvp["UserLevel"].ToString()); | ||
88 | if (kvp.ContainsKey("UserFlags")) | ||
89 | Convert.ToInt32(kvp["UserFlags"].ToString()); | ||
90 | if (kvp.ContainsKey("UserTitle")) | ||
91 | Email = kvp["UserTitle"].ToString(); | ||
92 | |||
78 | if (kvp.ContainsKey("Created")) | 93 | if (kvp.ContainsKey("Created")) |
79 | Convert.ToInt32(kvp["Created"].ToString()); | 94 | Convert.ToInt32(kvp["Created"].ToString()); |
80 | if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null) | 95 | if (kvp.ContainsKey("ServiceURLs") && kvp["ServiceURLs"] != null) |
@@ -104,6 +119,10 @@ namespace OpenSim.Services.Interfaces | |||
104 | result["PrincipalID"] = PrincipalID.ToString(); | 119 | result["PrincipalID"] = PrincipalID.ToString(); |
105 | result["ScopeID"] = ScopeID.ToString(); | 120 | result["ScopeID"] = ScopeID.ToString(); |
106 | result["Created"] = Created.ToString(); | 121 | result["Created"] = Created.ToString(); |
122 | result["UserLavel"] = UserLevel.ToString(); | ||
123 | result["UserFlags"] = UserFlags.ToString(); | ||
124 | result["UserTitle"] = UserTitle; | ||
125 | |||
107 | string str = string.Empty; | 126 | string str = string.Empty; |
108 | foreach (KeyValuePair<string, object> kvp in ServiceURLs) | 127 | foreach (KeyValuePair<string, object> kvp in ServiceURLs) |
109 | { | 128 | { |