diff options
author | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
commit | e0eba26f7bd2258ec026a42e278420fa0938cea7 (patch) | |
tree | 39ae2410374c07ff62a52af3551888746ed36c3c /OpenSim/Framework/Communications | |
parent | oops, add file missing from last commit (diff) | |
parent | First attempt at fixing mantis #4641. It's better but there are now some issu... (diff) | |
download | opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.zip opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.gz opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.bz2 opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Osp/OspResolver.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs index 2e55f53..24ea64d 100644 --- a/OpenSim/Framework/Communications/Osp/OspResolver.cs +++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs | |||
@@ -139,6 +139,9 @@ namespace OpenSim.Framework.Communications.Osp | |||
139 | /// </returns> | 139 | /// </returns> |
140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) | 140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) |
141 | { | 141 | { |
142 | if (userService == null) | ||
143 | return UUID.Zero; | ||
144 | |||
142 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); | 145 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); |
143 | 146 | ||
144 | if (nameSeparatorIndex < 0) | 147 | if (nameSeparatorIndex < 0) |
@@ -149,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp | |||
149 | 152 | ||
150 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); | 153 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); |
151 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); | 154 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); |
152 | 155 | ||
153 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); | 156 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); |
154 | if (account != null) | 157 | if (account != null) |
155 | return account.PrincipalID; | 158 | return account.PrincipalID; |