From d649194be310bf267675ac3cd9f9fce302cc3798 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Aug 2009 12:52:40 +0100
Subject: minor: formatting and comments

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 3301536..650fc7e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -535,7 +535,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             UUID newFolderId = UUID.Random();
-            InventoryFolderBase newFolder = new InventoryFolderBase(newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version);
+            InventoryFolderBase newFolder 
+                = new InventoryFolderBase(
+                    newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version);
             InventoryService.AddFolder(newFolder);
 
             // Give all the subfolders
-- 
cgit v1.1


From 22a0dff22624984080bebc03ff63025fc213eeff Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 28 Aug 2009 23:28:32 +0100
Subject: Modify CAPS inventory code. Currently this is not executed

---
 OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework')

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
         /// <param name="fetchItems"></param>
         /// <param name="sortOrder"></param>
         /// <returns>null if the inventory look up failed</returns>
-        public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
+        public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
                                                    bool fetchFolders, bool fetchItems, int sortOrder)
         {
 //            m_log.DebugFormat(
@@ -487,11 +487,15 @@ namespace OpenSim.Region.Framework.Scenes
             InventoryFolderImpl fold;
             if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
             {
-                return fold.RequestListOfItems();
+                InventoryCollection ret = new InventoryCollection();
+                ret.Folders = new List<InventoryFolderBase>();
+                ret.Items = fold.RequestListOfItems();
+
+                return ret;
             }
 
             InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID);
-            return contents.Items;
+            return contents;
 
         }        
         
-- 
cgit v1.1


From 976cf4284bdbef14553c2e164cb67d25bd2b9076 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 29 Aug 2009 03:26:44 +0100
Subject: Fix up WebFetchInventoryDescendents to really return all data needed,
 especially the folder version and the subfolders. Fixes inventory search hang
 and folders not loading.

---
 .../Region/Framework/Scenes/Scene.PacketHandlers.cs    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index c816790..55b100b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="sortOrder"></param>
         /// <returns>null if the inventory look up failed</returns>
         public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
-                                                   bool fetchFolders, bool fetchItems, int sortOrder)
+                                                   bool fetchFolders, bool fetchItems, int sortOrder, out int version)
         {
 //            m_log.DebugFormat(
 //                "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
@@ -487,6 +487,7 @@ namespace OpenSim.Region.Framework.Scenes
             InventoryFolderImpl fold;
             if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
             {
+                version = 0;
                 InventoryCollection ret = new InventoryCollection();
                 ret.Folders = new List<InventoryFolderBase>();
                 ret.Items = fold.RequestListOfItems();
@@ -495,6 +496,21 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID);
+
+            if (folderID != UUID.Zero)
+            {
+                InventoryFolderBase containingFolder = new InventoryFolderBase();
+                containingFolder.ID = folderID;
+                containingFolder.Owner = agentID;
+                containingFolder = InventoryService.GetFolder(containingFolder);
+                version = containingFolder.Version;
+            }
+            else
+            {
+                // Lost itemsm don't really need a version
+                version = 1;
+            }
+
             return contents;
 
         }        
-- 
cgit v1.1