diff options
author | Diva Canto | 2010-11-29 09:57:41 -0800 |
---|---|---|
committer | Diva Canto | 2010-11-29 09:57:41 -0800 |
commit | 49b59fffee54bb7aa7db2382ba564c99368945d4 (patch) | |
tree | 28a352061fbaa41a2d29f15f41b284e3589f033a /OpenSim/Framework/Serialization/External | |
parent | Preservation of creator information now also working in IARs. Cleaned up usag... (diff) | |
download | opensim-SC_OLD-49b59fffee54bb7aa7db2382ba564c99368945d4.zip opensim-SC_OLD-49b59fffee54bb7aa7db2382ba564c99368945d4.tar.gz opensim-SC_OLD-49b59fffee54bb7aa7db2382ba564c99368945d4.tar.bz2 opensim-SC_OLD-49b59fffee54bb7aa7db2382ba564c99368945d4.tar.xz |
Fix unit test.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Serialization/External/OspResolver.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs index 53c35ff..7e3dd1b 100644 --- a/OpenSim/Framework/Serialization/External/OspResolver.cs +++ b/OpenSim/Framework/Serialization/External/OspResolver.cs | |||
@@ -57,6 +57,12 @@ namespace OpenSim.Framework.Serialization | |||
57 | /// <returns>The OSPA. Null if a user with the given UUID could not be found.</returns> | 57 | /// <returns>The OSPA. Null if a user with the given UUID could not be found.</returns> |
58 | public static string MakeOspa(UUID userId, IUserAccountService userService) | 58 | public static string MakeOspa(UUID userId, IUserAccountService userService) |
59 | { | 59 | { |
60 | if (userService == null) | ||
61 | { | ||
62 | m_log.Warn("[OSP RESOLVER]: UserService is null"); | ||
63 | return userId.ToString(); | ||
64 | } | ||
65 | |||
60 | UserAccount account = userService.GetUserAccount(UUID.Zero, userId); | 66 | UserAccount account = userService.GetUserAccount(UUID.Zero, userId); |
61 | if (account != null) | 67 | if (account != null) |
62 | return MakeOspa(account.FirstName, account.LastName); | 68 | return MakeOspa(account.FirstName, account.LastName); |