diff options
author | Diva Canto | 2013-06-29 21:05:45 -0700 |
---|---|---|
committer | Diva Canto | 2013-06-29 21:05:45 -0700 |
commit | 0c9702156581cd3948fe07bdae23f3530105d2b5 (patch) | |
tree | 16c042083ae247664fc2876d9480dc15313908a2 /OpenSim/Region/CoreModules/Avatar/Friends | |
parent | A little more debug for the Unknown User problem mantis #6625 (diff) | |
download | opensim-SC_OLD-0c9702156581cd3948fe07bdae23f3530105d2b5.zip opensim-SC_OLD-0c9702156581cd3948fe07bdae23f3530105d2b5.tar.gz opensim-SC_OLD-0c9702156581cd3948fe07bdae23f3530105d2b5.tar.bz2 opensim-SC_OLD-0c9702156581cd3948fe07bdae23f3530105d2b5.tar.xz |
More debug for mantis #6625. It looks like the home friends list is being fetched on HG TPs.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index b3e3aa2..ae45b99 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
183 | if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp)) | 183 | if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp)) |
184 | { | 184 | { |
185 | IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); | 185 | IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); |
186 | m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend); | ||
186 | uMan.AddUser(id, url + ";" + first + " " + last); | 187 | uMan.AddUser(id, url + ";" + first + " " + last); |
187 | } | 188 | } |
188 | } | 189 | } |
@@ -347,31 +348,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
347 | return null; | 348 | return null; |
348 | } | 349 | } |
349 | 350 | ||
350 | public override FriendInfo[] GetFriendsFromService(IClientAPI client) | 351 | // public override FriendInfo[] GetFriendsFromService(IClientAPI client) |
351 | { | 352 | // { |
352 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); | 353 | //// m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); |
353 | Boolean agentIsLocal = true; | 354 | // Boolean agentIsLocal = true; |
354 | if (UserManagementModule != null) | 355 | // if (UserManagementModule != null) |
355 | agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); | 356 | // agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); |
356 | 357 | ||
357 | if (agentIsLocal) | 358 | // if (agentIsLocal) |
358 | return base.GetFriendsFromService(client); | 359 | // return base.GetFriendsFromService(client); |
359 | 360 | ||
360 | FriendInfo[] finfos = new FriendInfo[0]; | 361 | // FriendInfo[] finfos = new FriendInfo[0]; |
361 | // Foreigner | 362 | // // Foreigner |
362 | AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); | 363 | // AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); |
363 | if (agentClientCircuit != null) | 364 | // if (agentClientCircuit != null) |
364 | { | 365 | // { |
365 | //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); | 366 | // //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); |
366 | 367 | ||
367 | finfos = FriendsService.GetFriends(client.AgentId.ToString()); | 368 | // finfos = FriendsService.GetFriends(client.AgentId.ToString()); |
368 | m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString()); | 369 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString()); |
369 | } | 370 | // } |
370 | 371 | ||
371 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); | 372 | //// m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); |
372 | 373 | ||
373 | return finfos; | 374 | // return finfos; |
374 | } | 375 | // } |
375 | 376 | ||
376 | protected override bool StoreRights(UUID agentID, UUID friendID, int rights) | 377 | protected override bool StoreRights(UUID agentID, UUID friendID, int rights) |
377 | { | 378 | { |