diff options
| author | Melanie | 2011-01-24 02:16:28 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-24 02:16:28 +0100 |
| commit | dbbf43663e688b136d806965edfb82b4cd9e3e91 (patch) | |
| tree | 48a3ffa0bf6a29a80edb34632aabd3451fdf9a55 /OpenSim/Services/UserAccountService/UserAccountService.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-dbbf43663e688b136d806965edfb82b4cd9e3e91.zip opensim-SC-dbbf43663e688b136d806965edfb82b4cd9e3e91.tar.gz opensim-SC-dbbf43663e688b136d806965edfb82b4cd9e3e91.tar.bz2 opensim-SC-dbbf43663e688b136d806965edfb82b4cd9e3e91.tar.xz | |
Add a careminster API to scripting again
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index de6d32c..cbd6f35 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -148,6 +148,10 @@ namespace OpenSim.Services.UserAccountService | |||
| 148 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); | 148 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); |
| 149 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) | 149 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) |
| 150 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); | 150 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); |
| 151 | if (d.Data.ContainsKey("UserCountry") && d.Data["UserCountry"] != null) | ||
| 152 | u.UserCountry = d.Data["UserCountry"].ToString(); | ||
| 153 | else | ||
| 154 | u.UserTitle = string.Empty; | ||
| 151 | 155 | ||
| 152 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) | 156 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) |
| 153 | { | 157 | { |