aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-08-28 23:28:32 +0100
committerMelanie2009-08-28 23:28:32 +0100
commit22a0dff22624984080bebc03ff63025fc213eeff (patch)
treef106ca76fca4500198cb697180c5d87afae05292 /OpenSim/Region
parentImplements osDrawPolygon, similar to already implemented osDrawFilledPolygon (diff)
downloadopensim-SC_OLD-22a0dff22624984080bebc03ff63025fc213eeff.zip
opensim-SC_OLD-22a0dff22624984080bebc03ff63025fc213eeff.tar.gz
opensim-SC_OLD-22a0dff22624984080bebc03ff63025fc213eeff.tar.bz2
opensim-SC_OLD-22a0dff22624984080bebc03ff63025fc213eeff.tar.xz
Modify CAPS inventory code. Currently this is not executed
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index d3e414f..c816790 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Framework.Scenes
472 /// <param name="fetchItems"></param> 472 /// <param name="fetchItems"></param>
473 /// <param name="sortOrder"></param> 473 /// <param name="sortOrder"></param>
474 /// <returns>null if the inventory look up failed</returns> 474 /// <returns>null if the inventory look up failed</returns>
475 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID, 475 public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
476 bool fetchFolders, bool fetchItems, int sortOrder) 476 bool fetchFolders, bool fetchItems, int sortOrder)
477 { 477 {
478// m_log.DebugFormat( 478// m_log.DebugFormat(
@@ -487,11 +487,15 @@ namespace OpenSim.Region.Framework.Scenes
487 InventoryFolderImpl fold; 487 InventoryFolderImpl fold;
488 if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) 488 if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
489 { 489 {
490 return fold.RequestListOfItems(); 490 InventoryCollection ret = new InventoryCollection();
491 ret.Folders = new List<InventoryFolderBase>();
492 ret.Items = fold.RequestListOfItems();
493
494 return ret;
491 } 495 }
492 496
493 InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID); 497 InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID);
494 return contents.Items; 498 return contents;
495 499
496 } 500 }
497 501