diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index fd12a57..f0493f7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -455,15 +455,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
455 | private bool IsLocalGridUser(UUID userID) | 455 | private bool IsLocalGridUser(UUID userID) |
456 | { | 456 | { |
457 | if (m_UserProfileService == null) | 457 | if (m_UserProfileService == null) |
458 | { | ||
459 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile service. Returning false."); | ||
458 | return false; | 460 | return false; |
461 | } | ||
459 | 462 | ||
460 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); | 463 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
461 | if (uinfo == null) | 464 | if (uinfo == null) |
465 | { | ||
466 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile for user {0}. Returning false.", userID); | ||
462 | return true; | 467 | return true; |
468 | } | ||
463 | 469 | ||
464 | string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); | 470 | string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); |
471 | string uri = m_LocalGridInventoryURI.TrimEnd('/'); | ||
472 | |||
473 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, comparing {0} to {1}.", userInventoryServerURI, uri); | ||
465 | 474 | ||
466 | if ((userInventoryServerURI == m_LocalGridInventoryURI) || (userInventoryServerURI == "")) | 475 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) |
467 | { | 476 | { |
468 | return true; | 477 | return true; |
469 | } | 478 | } |