diff options
author | Diva Canto | 2009-08-14 08:43:46 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-14 08:43:46 -0700 |
commit | 332d1b5f2f7684de7e359be17f929f85fe4dbe2c (patch) | |
tree | 5ea65371665d1c8829845a9dd731e7317adc7207 /OpenSim | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-332d1b5f2f7684de7e359be17f929f85fe4dbe2c.zip opensim-SC_OLD-332d1b5f2f7684de7e359be17f929f85fe4dbe2c.tar.gz opensim-SC_OLD-332d1b5f2f7684de7e359be17f929f85fe4dbe2c.tar.bz2 opensim-SC_OLD-332d1b5f2f7684de7e359be17f929f85fe4dbe2c.tar.xz |
Additional debug messages, and bug fix in RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 3 |
2 files changed, 12 insertions, 2 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 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index e4bb865..8722e68 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -104,12 +104,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
104 | 104 | ||
105 | public void AddRegion(Scene scene) | 105 | public void AddRegion(Scene scene) |
106 | { | 106 | { |
107 | m_Scene = scene; | ||
108 | |||
107 | if (!m_Enabled) | 109 | if (!m_Enabled) |
108 | return; | 110 | return; |
109 | 111 | ||
110 | if (!m_Initialized) | 112 | if (!m_Initialized) |
111 | { | 113 | { |
112 | m_Scene = scene; | ||
113 | // ugh! | 114 | // ugh! |
114 | scene.CommsManager.UserProfileCacheService.SetInventoryService(this); | 115 | scene.CommsManager.UserProfileCacheService.SetInventoryService(this); |
115 | scene.CommsManager.UserService.SetInventoryService(this); | 116 | scene.CommsManager.UserService.SetInventoryService(this); |