aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService/UserAccountService.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-10 14:06:12 -0800
committerJohn Hurliman2010-03-10 14:06:12 -0800
commitb18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a (patch)
treec20d8f5be598d70caff0589629427f6450573cf4 /OpenSim/Services/UserAccountService/UserAccountService.cs
parent* Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debu... (diff)
parentReintroduce a check that was dropped from permissions (diff)
downloadopensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.zip
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.gz
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.bz2
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/UserAccountService/UserAccountService.cs')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs2
1 files changed, 2 insertions, 0 deletions
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 }