aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService
diff options
context:
space:
mode:
authorMelanie2010-04-04 02:24:52 +0100
committerMelanie2010-04-04 02:24:52 +0100
commitdc58c985e8850d54b09f47c7938f255cca476167 (patch)
tree49c7436e3ed86cfec2bc50127b2f7afbd1722200 /OpenSim/Services/UserAccountService
parentPatch from mcortez. This appears to be a huge change to the groups module (diff)
parent* Guard against null in last commit (diff)
downloadopensim-SC_OLD-dc58c985e8850d54b09f47c7938f255cca476167.zip
opensim-SC_OLD-dc58c985e8850d54b09f47c7938f255cca476167.tar.gz
opensim-SC_OLD-dc58c985e8850d54b09f47c7938f255cca476167.tar.bz2
opensim-SC_OLD-dc58c985e8850d54b09f47c7938f255cca476167.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 38caf74..7b38aa6 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -134,6 +134,10 @@ namespace OpenSim.Services.UserAccountService
134 u.UserTitle = d.Data["UserTitle"].ToString(); 134 u.UserTitle = d.Data["UserTitle"].ToString();
135 else 135 else
136 u.UserTitle = string.Empty; 136 u.UserTitle = string.Empty;
137 if (d.Data.ContainsKey("UserLevel") && d.Data["UserLevel"] != null)
138 Int32.TryParse(d.Data["UserLevel"], out u.UserLevel);
139 if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null)
140 Int32.TryParse(d.Data["UserFlags"], out u.UserFlags);
137 141
138 if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) 142 if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null)
139 { 143 {
@@ -218,6 +222,10 @@ namespace OpenSim.Services.UserAccountService
218 d.Data = new Dictionary<string, string>(); 222 d.Data = new Dictionary<string, string>();
219 d.Data["Email"] = data.Email; 223 d.Data["Email"] = data.Email;
220 d.Data["Created"] = data.Created.ToString(); 224 d.Data["Created"] = data.Created.ToString();
225 d.Data["UserLevel"] = data.UserLevel.ToString();
226 d.Data["UserFlags"] = data.UserFlags.ToString();
227 if (data.UserTitle != null)
228 d.Data["UserTitle"] = data.UserTitle.ToString();
221 229
222 List<string> parts = new List<string>(); 230 List<string> parts = new List<string>();
223 231