diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 16 |
1 files changed, 14 insertions, 2 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 | ||