Fix up WebFetchInventoryDescendents to really return all data needed,

especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.

3 files changed, 30 insertions, 18 deletions

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 5ae33d6..c5560b8 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Capabilities
                                                    bool isScriptRunning, byte[] data);
 
     public delegate InventoryCollection FetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
-                                                                          bool fetchFolders, bool fetchItems, int sortOrder);
+                                                                          bool fetchFolders, bool fetchItems, int sortOrder, out int version);
 
     /// <summary>
     /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Capabilities
         //private static readonly string m_requestTexture = "0003/";
         private static readonly string m_notecardUpdatePath = "0004/";
         private static readonly string m_notecardTaskUpdatePath = "0005/";
-        // private static readonly string m_fetchInventoryPath = "0006/";
+        private static readonly string m_fetchInventoryPath = "0006/";
 
         // The following entries are in a module, however, they are also here so that we don't re-assign
         // the path to another cap by mistake.
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Capabilities
                 // As of RC 1.22.9 of the Linden client this is
                 // supported
 
-                // m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest);
+                m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest);
 
                 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
                 // subsequent inventory breakage, in the edit object pane (such as mantis 1085).  This requires
@@ -449,23 +449,14 @@ namespace OpenSim.Framework.Capabilities
             contents.owner_id =  invFetch.owner_id;
             contents.folder_id = invFetch.folder_id;
 
-            // The version number being sent back was originally 1.
-            // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins
-            // without clearing client cache, objects in the root folder disappear until the cache is cleared,
-            // at which point they reappear.
-            //
-            // Seeing the version to something other than 0 may be the right thing to do, but there is
-            // a greater subtlety of the second life protocol that needs to be understood first.
-            contents.version = 0;
-
-            contents.descendents = 0;
             reply.folders.Array.Add(contents);
             InventoryCollection inv = new InventoryCollection();
             inv.Folders = new List<InventoryFolderBase>();
             inv.Items = new List<InventoryItemBase>();
+            int version = 0;
             if (CAPSFetchInventoryDescendents != null)
             {
-                inv = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order);
+                inv = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
             }
 
             if (inv.Folders != null)
@@ -484,7 +475,9 @@ namespace OpenSim.Framework.Capabilities
                 }
             }
 
-            contents.descendents = contents.items.Array.Count;
+            contents.descendents = contents.items.Array.Count + contents.categories.Array.Count;
+            contents.version = version;
+
             return reply;
         }
 
@@ -499,7 +492,10 @@ namespace OpenSim.Framework.Capabilities
             llsdFolder.folder_id = invFolder.ID;
             llsdFolder.parent_id = invFolder.ParentID;
             llsdFolder.name = invFolder.Name;
-            llsdFolder.type = TaskInventoryItem.InvTypes[invFolder.Type];
+            if (invFolder.Type == -1)
+                llsdFolder.type = "-1";
+            else
+                llsdFolder.type = TaskInventoryItem.Types[invFolder.Type];
             llsdFolder.preferred_type = "-1";
 
             return llsdFolder;
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 2ef4a36..3f72c31 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             Stream requestStream = request.GetRequestStream();
             requestStream.Write(buffer.ToArray(), 0, length);
+            requestStream.Close();
             TResponse deserial = default(TResponse);
             using (WebResponse resp = request.GetResponse())
             {
@@ -101,7 +102,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
                 resp.Close();
             }
-            requestStream.Close();
             return deserial;
         }
     }
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;
 
         }