aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e561efb..4ae4dc3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -477,9 +477,9 @@ namespace OpenSim.Region.Framework.Scenes
477 public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID, 477 public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
478 bool fetchFolders, bool fetchItems, int sortOrder, out int version) 478 bool fetchFolders, bool fetchItems, int sortOrder, out int version)
479 { 479 {
480// m_log.DebugFormat( 480 m_log.DebugFormat(
481// "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", 481 "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
482// fetchFolders, fetchItems, folderID, agentID); 482 fetchFolders, fetchItems, folderID, agentID);
483 483
484 // FIXME MAYBE: We're not handling sortOrder! 484 // FIXME MAYBE: We're not handling sortOrder!
485 485
@@ -497,10 +497,11 @@ namespace OpenSim.Region.Framework.Scenes
497 return ret; 497 return ret;
498 } 498 }
499 499
500 InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID); 500 InventoryCollection contents = new InventoryCollection();
501 501
502 if (folderID != UUID.Zero) 502 if (folderID != UUID.Zero)
503 { 503 {
504 contents = InventoryService.GetFolderContent(agentID, folderID);
504 InventoryFolderBase containingFolder = new InventoryFolderBase(); 505 InventoryFolderBase containingFolder = new InventoryFolderBase();
505 containingFolder.ID = folderID; 506 containingFolder.ID = folderID;
506 containingFolder.Owner = agentID; 507 containingFolder.Owner = agentID;