* Various 1.19.0.5 grid inventory request fixes. These will only take affect once the region and the grid servers have upgraded to this revision

* You may also need to clear your cache before seeing any effect.
* These fixes may or may not affect inventory on the RC client.
* These fixes should make non-root folders work better, stop inventory failure on first login, allow trash to be emptied and make texture picker in object edit view work properly
* Fixes are 1) make initial root folder request wait for async inventory delivery, 2) deliver all folders in the initial login skeleton, not just the root child ones and 3) deal 
with situations where we receive child folders from the inventory service before their parent is received.

3 files changed, 35 insertions, 16 deletions

diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index ea85d5f..cfe06e8 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -108,8 +108,7 @@ namespace OpenSim.Grid.InventoryServer
         {
             LLUUID userID = new LLUUID(rawUserID);
 
-            // We get enough verbose messages later on for diagnostics
-            //m_log.Info("[INVENTORY]: Request for inventory for " + userID.ToString());            
+            m_log.Info("[GRID INVENTORY]: Request for inventory of " + userID.ToString());            
 
             InventoryCollection invCollection = new InventoryCollection();
             List<InventoryFolderBase> folders;
@@ -120,6 +119,21 @@ namespace OpenSim.Grid.InventoryServer
                 invCollection.Folders = folders;
                 invCollection.UserID = userID;
             }
+            
+//            foreach (InventoryFolderBase folder in folders)
+//            {
+//                m_log.DebugFormat(
+//                    "[GRID INVENTORY]: Sending back folder {0}, {1}", 
+//                    folder.name, folder.folderID);
+//            }
+//            
+//            foreach (InventoryItemBase item in allItems)
+//            {
+//                m_log.DebugFormat(
+//                    "[GRID INVENTORY]: Sending back item {0}, {1}, folder {2}", 
+//                    item.inventoryName, item.inventoryID, item.parentFolderID);
+//            }
+                        
             return invCollection;
         }
 
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index ea056a0..009f3f1 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -83,29 +83,32 @@ namespace OpenSim.Grid.InventoryServer
         protected void AddHttpHandlers()
         {
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<Guid, InventoryCollection>("POST", "/GetInventory/",
-                                                                      m_inventoryService.GetUserInventory));
+                new RestDeserialisehandler<Guid, InventoryCollection>(
+                    "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
+            
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<Guid, bool>("POST", "/CreateInventory/",
-                                                       m_inventoryService.CreateUsersInventory));
+                new RestDeserialisehandler<Guid, bool>(
+                    "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
+            
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/NewFolder/",
-                                                                      m_inventoryService.AddInventoryFolder));
+                new RestDeserialisehandler<InventoryFolderBase, bool>(
+                    "POST", "/NewFolder/", m_inventoryService.AddInventoryFolder));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/MoveFolder/",
-                                                                      m_inventoryService.MoveInventoryFolder));
+                new RestDeserialisehandler<InventoryFolderBase, bool>(
+                    "POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/NewItem/",
-                                                                    m_inventoryService.AddInventoryItem));
+                new RestDeserialisehandler<InventoryItemBase, bool>(
+                    "POST", "/NewItem/", m_inventoryService.AddInventoryItem));
+            
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/DeleteItem/",
-                                                                    m_inventoryService.DeleteInvItem));
+                new RestDeserialisehandler<InventoryItemBase, bool>(
+                    "POST", "/DeleteItem/", m_inventoryService.DeleteInvItem));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<Guid, List<InventoryFolderBase>>("POST", "/RootFolders/",
-                                                                            m_inventoryService.RequestFirstLevelFolders));
+                new RestDeserialisehandler<Guid, List<InventoryFolderBase>>
+                    ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
 
             // httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));
         }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index e95acac..6d3a081 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -323,6 +323,8 @@ namespace OpenSim.Grid.UserServer
                 Hashtable TempHash;
                 foreach (InventoryFolderBase InvFolder in folders)
                 {
+//                    m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
+                    
                     if (InvFolder.parentID == LLUUID.Zero)
                     {
                         rootID = InvFolder.folderID;