diff options
author | Diva Canto | 2009-08-18 22:36:03 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-18 22:36:03 -0700 |
commit | e5f33e75055a8f83cf4e11a6120774cb90dbc3be (patch) | |
tree | c7c8fd3b0a8ece30c39d2fac9929779bc9abc6e8 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |
parent | jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024 (diff) | |
download | opensim-SC_OLD-e5f33e75055a8f83cf4e11a6120774cb90dbc3be.zip opensim-SC_OLD-e5f33e75055a8f83cf4e11a6120774cb90dbc3be.tar.gz opensim-SC_OLD-e5f33e75055a8f83cf4e11a6120774cb90dbc3be.tar.bz2 opensim-SC_OLD-e5f33e75055a8f83cf4e11a6120774cb90dbc3be.tar.xz |
GetFolderItems implemented. It's not being called, but it might.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 492598e..3649097 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -290,7 +290,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
290 | 290 | ||
291 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 291 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
292 | { | 292 | { |
293 | return new List<InventoryItemBase>(); | 293 | if (IsLocalGridUser(userID)) |
294 | return m_GridService.GetFolderItems(userID, folderID); | ||
295 | else | ||
296 | { | ||
297 | UUID sessionID = GetSessionID(userID); | ||
298 | string uri = GetUserInventoryURI(userID) + "/" + userID; | ||
299 | return m_HGService.GetFolderItems(uri, folderID, sessionID); | ||
300 | } | ||
294 | } | 301 | } |
295 | 302 | ||
296 | public override bool AddFolder(InventoryFolderBase folder) | 303 | public override bool AddFolder(InventoryFolderBase folder) |
@@ -487,7 +494,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
487 | { | 494 | { |
488 | return true; | 495 | return true; |
489 | } | 496 | } |
490 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user is foreign({0} - {1})", userInventoryServerURI, uri); | 497 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user {0} is foreign({1} - {2})", userID, userInventoryServerURI, uri); |
491 | return false; | 498 | return false; |
492 | } | 499 | } |
493 | 500 | ||