aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2013-07-16 18:22:42 -0700
committerDiva Canto2013-07-16 18:22:42 -0700
commit5f27aaa6ddb857dbfbbe0219d0e29c42ad903375 (patch)
tree2b678fe6b64a3cf5075c18fa660dcfb23f6879f8 /OpenSim/Region/CoreModules
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-5f27aaa6ddb857dbfbbe0219d0e29c42ad903375.zip
opensim-SC_OLD-5f27aaa6ddb857dbfbbe0219d0e29c42ad903375.tar.gz
opensim-SC_OLD-5f27aaa6ddb857dbfbbe0219d0e29c42ad903375.tar.bz2
opensim-SC_OLD-5f27aaa6ddb857dbfbbe0219d0e29c42ad903375.tar.xz
UserManagementModule: in the continuation, call the method that also looks up the cache, because the resource may be here in the meantime
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index da28a53..e8bdcc9 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -172,11 +172,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
172 return; 172 return;
173 } 173 }
174 174
175 // Not found in cache, get it from services 175 // Not found in cache, queue continuation
176 m_ServiceThrottle.Enqueue(delegate 176 m_ServiceThrottle.Enqueue(delegate
177 { 177 {
178 //m_log.DebugFormat("[YYY]: Name request {0}", uuid); 178 //m_log.DebugFormat("[YYY]: Name request {0}", uuid);
179 bool foundRealName = TryGetUserNamesFromServices(uuid, names); 179 bool foundRealName = TryGetUserNames(uuid, names);
180 180
181 if (names.Length == 2) 181 if (names.Length == 2)
182 { 182 {