aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs58
2 files changed, 0 insertions, 59 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index b93a41b..8f0ae76 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -134,7 +134,6 @@ namespace OpenSim.Region.ClientStack.Linden
134 AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; 134 AddNewInventoryItem = m_Scene.AddUploadedInventoryItem;
135 ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; 135 ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
136 TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; 136 TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
137 CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS;
138 GetClient = m_Scene.SceneGraph.GetControllingClient; 137 GetClient = m_Scene.SceneGraph.GetControllingClient;
139 } 138 }
140 139
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 270e582..2ac6387 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -511,64 +511,6 @@ namespace OpenSim.Region.Framework.Scenes
511 SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState; 511 SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
512 d.EndInvoke(iar); 512 d.EndInvoke(iar);
513 } 513 }
514
515 /// <summary>
516 /// Handle the caps inventory descendents fetch.
517 ///
518 /// Since the folder structure is sent to the client on login, I believe we only need to handle items.
519 /// Diva comment 8/13/2009: what if someone gave us a folder in the meantime??
520 /// </summary>
521 /// <param name="agentID"></param>
522 /// <param name="folderID"></param>
523 /// <param name="ownerID"></param>
524 /// <param name="fetchFolders"></param>
525 /// <param name="fetchItems"></param>
526 /// <param name="sortOrder"></param>
527 /// <returns>null if the inventory look up failed</returns>
528 public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
529 bool fetchFolders, bool fetchItems, int sortOrder, out int version)
530 {
531 m_log.DebugFormat(
532 "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
533 fetchFolders, fetchItems, folderID, agentID);
534
535 // FIXME MAYBE: We're not handling sortOrder!
536
537 // TODO: This code for looking in the folder for the library should be folded back into the
538 // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
539 // can be handled transparently).
540 InventoryFolderImpl fold;
541 if (LibraryService != null && LibraryService.LibraryRootFolder != null)
542 if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
543 {
544 version = 0;
545 InventoryCollection ret = new InventoryCollection();
546 ret.Folders = new List<InventoryFolderBase>();
547 ret.Items = fold.RequestListOfItems();
548
549 return ret;
550 }
551
552 InventoryCollection contents = new InventoryCollection();
553
554 if (folderID != UUID.Zero)
555 {
556 contents = InventoryService.GetFolderContent(agentID, folderID);
557 InventoryFolderBase containingFolder = new InventoryFolderBase();
558 containingFolder.ID = folderID;
559 containingFolder.Owner = agentID;
560 containingFolder = InventoryService.GetFolder(containingFolder);
561 version = containingFolder.Version;
562 }
563 else
564 {
565 // Lost itemsm don't really need a version
566 version = 1;
567 }
568
569 return contents;
570
571 }
572 514
573 /// <summary> 515 /// <summary>
574 /// Handle an inventory folder creation request from the client. 516 /// Handle an inventory folder creation request from the client.