diff options
author | Diva Canto | 2009-08-14 11:32:25 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-14 11:32:25 -0700 |
commit | bb513c1d885284d7cc1d97ea2cc4fb834b8bada1 (patch) | |
tree | 3a2714bae6eb83b42b7ac72fd4504bab4fe9a035 /OpenSim/Region/CoreModules | |
parent | More debug messages. (diff) | |
download | opensim-SC-bb513c1d885284d7cc1d97ea2cc4fb834b8bada1.zip opensim-SC-bb513c1d885284d7cc1d97ea2cc4fb834b8bada1.tar.gz opensim-SC-bb513c1d885284d7cc1d97ea2cc4fb834b8bada1.tar.bz2 opensim-SC-bb513c1d885284d7cc1d97ea2cc4fb834b8bada1.tar.xz |
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 8 |
2 files changed, 19 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index cb9a462..59b2019 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -238,7 +238,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
238 | public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) | 238 | public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) |
239 | { | 239 | { |
240 | if (IsLocalGridUser(userID)) | 240 | if (IsLocalGridUser(userID)) |
241 | return GetSystemFoldersLocal(userID); | 241 | { |
242 | // This is not pretty, but it will have to do for now | ||
243 | if (m_GridService is BaseInventoryConnector) | ||
244 | { | ||
245 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetSystemsFolders redirected to RemoteInventoryServiceConnector module"); | ||
246 | return ((BaseInventoryConnector)m_GridService).GetSystemFolders(userID); | ||
247 | } | ||
248 | else | ||
249 | { | ||
250 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetSystemsFolders redirected to GetSystemFoldersLocal"); | ||
251 | return GetSystemFoldersLocal(userID); | ||
252 | } | ||
253 | } | ||
242 | else | 254 | else |
243 | { | 255 | { |
244 | UUID sessionID = GetSessionID(userID); | 256 | UUID sessionID = GetSessionID(userID); |
@@ -464,7 +476,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
464 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); | 476 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
465 | if (uinfo == null) | 477 | if (uinfo == null) |
466 | { | 478 | { |
467 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile for user {0}. Returning false.", userID); | 479 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile for user {0}. Returning true.", userID); |
468 | return true; | 480 | return true; |
469 | } | 481 | } |
470 | 482 | ||
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); |