diff options
| author | Justin Clark-Casey (justincc) | 2010-03-12 17:58:25 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-03-12 17:58:25 +0000 |
| commit | db61d66e746df4b1919b031de72bee7cf3a796f3 (patch) | |
| tree | 770a8101a52222f87f298de79fabbd4aad176333 /OpenSim/Services/UserAccountService | |
| parent | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell t... (diff) | |
| parent | Changed some properties and methods from private to protected in LLLoginRespo... (diff) | |
| download | opensim-SC_OLD-db61d66e746df4b1919b031de72bee7cf3a796f3.zip opensim-SC_OLD-db61d66e746df4b1919b031de72bee7cf3a796f3.tar.gz opensim-SC_OLD-db61d66e746df4b1919b031de72bee7cf3a796f3.tar.bz2 opensim-SC_OLD-db61d66e746df4b1919b031de72bee7cf3a796f3.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/UserAccountService')
| -rw-r--r-- | OpenSim/Services/UserAccountService/GridUserService.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index 36cce75..c6e33bb 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Services.UserAccountService | |||
| 58 | info.HomePosition = Vector3.Parse(d.Data["HomePosition"]); | 58 | info.HomePosition = Vector3.Parse(d.Data["HomePosition"]); |
| 59 | info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]); | 59 | info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]); |
| 60 | 60 | ||
| 61 | return info; | 61 | return info; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | public bool StoreGridUserInfo(GridUserInfo info) | 64 | public bool StoreGridUserInfo(GridUserInfo info) |
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 82c34e7..38caf74 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -200,7 +200,9 @@ namespace OpenSim.Services.UserAccountService | |||
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | if (d.Length < 1) | 202 | if (d.Length < 1) |
| 203 | { | ||
| 203 | return null; | 204 | return null; |
| 205 | } | ||
| 204 | 206 | ||
| 205 | return MakeUserAccount(d[0]); | 207 | return MakeUserAccount(d[0]); |
| 206 | } | 208 | } |