2 files changed, 33 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));
         }