diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 20cddcd..62df3bd 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
49 | private bool m_Enabled = false; | 49 | private bool m_Enabled = false; |
50 | private bool m_Initialized = false; | 50 | private bool m_Initialized = false; |
51 | private Scene m_Scene; | 51 | private Scene m_Scene; |
52 | private UserProfileCacheService m_UserProfileService; | ||
52 | private InventoryServicesConnector m_RemoteConnector; | 53 | private InventoryServicesConnector m_RemoteConnector; |
53 | 54 | ||
54 | public Type ReplaceableInterface | 55 | public Type ReplaceableInterface |
@@ -105,8 +106,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
105 | 106 | ||
106 | public void AddRegion(Scene scene) | 107 | public void AddRegion(Scene scene) |
107 | { | 108 | { |
108 | m_log.Debug("[XXXX] Adding scene " + scene.RegionInfo.RegionName); | ||
109 | m_Scene = scene; | 109 | m_Scene = scene; |
110 | m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); | ||
110 | 111 | ||
111 | if (!m_Enabled) | 112 | if (!m_Enabled) |
112 | return; | 113 | return; |
@@ -133,6 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
133 | 134 | ||
134 | public void RegionLoaded(Scene scene) | 135 | public void RegionLoaded(Scene scene) |
135 | { | 136 | { |
137 | m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService; | ||
136 | if (!m_Enabled) | 138 | if (!m_Enabled) |
137 | return; | 139 | return; |
138 | 140 | ||
@@ -318,10 +320,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
318 | if (m_Scene == null) | 320 | if (m_Scene == null) |
319 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); | 321 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); |
320 | 322 | ||
321 | if (m_Scene.CommsManager.UserProfileCacheService == null) | 323 | if (m_UserProfileService == null) |
322 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); | 324 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); |
323 | 325 | ||
324 | CachedUserInfo uinfo = m_Scene.CommsManager.UserProfileCacheService.GetUserDetails(userID); | 326 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
325 | if (uinfo != null) | 327 | if (uinfo != null) |
326 | return uinfo.SessionID; | 328 | return uinfo.SessionID; |
327 | m_log.DebugFormat("[INVENTORY CONNECTOR]: user profile for {0} not found", userID); | 329 | m_log.DebugFormat("[INVENTORY CONNECTOR]: user profile for {0} not found", userID); |