diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Framework/Serialization/External | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization/External')
-rw-r--r-- | OpenSim/Framework/Serialization/External/OspResolver.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs index 7e3dd1b..d31d27c 100644 --- a/OpenSim/Framework/Serialization/External/OspResolver.cs +++ b/OpenSim/Framework/Serialization/External/OspResolver.cs | |||
@@ -66,6 +66,8 @@ namespace OpenSim.Framework.Serialization | |||
66 | UserAccount account = userService.GetUserAccount(UUID.Zero, userId); | 66 | UserAccount account = userService.GetUserAccount(UUID.Zero, userId); |
67 | if (account != null) | 67 | if (account != null) |
68 | return MakeOspa(account.FirstName, account.LastName); | 68 | return MakeOspa(account.FirstName, account.LastName); |
69 | // else | ||
70 | // m_log.WarnFormat("[OSP RESOLVER]: No user account for {0}", userId); | ||
69 | 71 | ||
70 | return null; | 72 | return null; |
71 | } | 73 | } |
@@ -77,6 +79,8 @@ namespace OpenSim.Framework.Serialization | |||
77 | /// <returns></returns> | 79 | /// <returns></returns> |
78 | public static string MakeOspa(string firstName, string lastName) | 80 | public static string MakeOspa(string firstName, string lastName) |
79 | { | 81 | { |
82 | // m_log.DebugFormat("[OSP RESOLVER]: Making OSPA for {0} {1}", firstName, lastName); | ||
83 | |||
80 | return | 84 | return |
81 | OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName; | 85 | OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName; |
82 | } | 86 | } |
@@ -97,7 +101,10 @@ namespace OpenSim.Framework.Serialization | |||
97 | public static UUID ResolveOspa(string ospa, IUserAccountService userService) | 101 | public static UUID ResolveOspa(string ospa, IUserAccountService userService) |
98 | { | 102 | { |
99 | if (!ospa.StartsWith(OSPA_PREFIX)) | 103 | if (!ospa.StartsWith(OSPA_PREFIX)) |
100 | return UUID.Zero; | 104 | { |
105 | // m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa); | ||
106 | return UUID.Zero; | ||
107 | } | ||
101 | 108 | ||
102 | // m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); | 109 | // m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); |
103 | 110 | ||
@@ -161,7 +168,17 @@ namespace OpenSim.Framework.Serialization | |||
161 | 168 | ||
162 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); | 169 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); |
163 | if (account != null) | 170 | if (account != null) |
171 | { | ||
172 | // m_log.DebugFormat( | ||
173 | // "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", | ||
174 | // account.PrincipalID, firstName, lastName); | ||
175 | |||
164 | return account.PrincipalID; | 176 | return account.PrincipalID; |
177 | } | ||
178 | // else | ||
179 | // { | ||
180 | // m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name); | ||
181 | // } | ||
165 | 182 | ||
166 | // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc | 183 | // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc |
167 | /* | 184 | /* |