1 files changed, 17 insertions, 14 deletions
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/",
+                new RestDeserialisehandler<Guid, InventoryCollection>(
-                                                                      m_inventoryService.GetUserInventory));
+                    "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
+            
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<Guid, bool>("POST", "/CreateInventory/",
+                new RestDeserialisehandler<Guid, bool>(
-                                                       m_inventoryService.CreateUsersInventory));
+                    "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
+            
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/NewFolder/",
+                new RestDeserialisehandler<InventoryFolderBase, bool>(
-                                                                      m_inventoryService.AddInventoryFolder));
+                    "POST", "/NewFolder/", m_inventoryService.AddInventoryFolder));
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/MoveFolder/",
+                new RestDeserialisehandler<InventoryFolderBase, bool>(
-                                                                      m_inventoryService.MoveInventoryFolder));
+                    "POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/NewItem/",
+                new RestDeserialisehandler<InventoryItemBase, bool>(
-                                                                    m_inventoryService.AddInventoryItem));
+                    "POST", "/NewItem/", m_inventoryService.AddInventoryItem));
+            
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/DeleteItem/",
+                new RestDeserialisehandler<InventoryItemBase, bool>(
-                                                                    m_inventoryService.DeleteInvItem));
+                    "POST", "/DeleteItem/", m_inventoryService.DeleteInvItem));
            m_httpServer.AddStreamHandler(
-                new RestDeserialisehandler<Guid, List<InventoryFolderBase>>("POST", "/RootFolders/",
+                new RestDeserialisehandler<Guid, List<InventoryFolderBase>>
-                                                                            m_inventoryService.RequestFirstLevelFolders));
+                    ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
            // httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));
        }

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
83	protected void AddHttpHandlers()	83	protected void AddHttpHandlers()
84	{	84	{
85	m_httpServer.AddStreamHandler(	85	m_httpServer.AddStreamHandler(
86	new RestDeserialisehandler<Guid, InventoryCollection>("POST", "/GetInventory/",	86	new RestDeserialisehandler<Guid, InventoryCollection>(
87	m_inventoryService.GetUserInventory));	87	"POST", "/GetInventory/", m_inventoryService.GetUserInventory));
		88
88	m_httpServer.AddStreamHandler(	89	m_httpServer.AddStreamHandler(
89	new RestDeserialisehandler<Guid, bool>("POST", "/CreateInventory/",	90	new RestDeserialisehandler<Guid, bool>(
90	m_inventoryService.CreateUsersInventory));	91	"POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
		92
91	m_httpServer.AddStreamHandler(	93	m_httpServer.AddStreamHandler(
92	new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/NewFolder/",	94	new RestDeserialisehandler<InventoryFolderBase, bool>(
93	m_inventoryService.AddInventoryFolder));	95	"POST", "/NewFolder/", m_inventoryService.AddInventoryFolder));
94		96
95	m_httpServer.AddStreamHandler(	97	m_httpServer.AddStreamHandler(
96	new RestDeserialisehandler<InventoryFolderBase, bool>("POST", "/MoveFolder/",	98	new RestDeserialisehandler<InventoryFolderBase, bool>(
97	m_inventoryService.MoveInventoryFolder));	99	"POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
98		100
99	m_httpServer.AddStreamHandler(	101	m_httpServer.AddStreamHandler(
100	new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/NewItem/",	102	new RestDeserialisehandler<InventoryItemBase, bool>(
101	m_inventoryService.AddInventoryItem));	103	"POST", "/NewItem/", m_inventoryService.AddInventoryItem));
		104
102	m_httpServer.AddStreamHandler(	105	m_httpServer.AddStreamHandler(
103	new RestDeserialisehandler<InventoryItemBase, bool>("POST", "/DeleteItem/",	106	new RestDeserialisehandler<InventoryItemBase, bool>(
104	m_inventoryService.DeleteInvItem));	107	"POST", "/DeleteItem/", m_inventoryService.DeleteInvItem));
105		108
106	m_httpServer.AddStreamHandler(	109	m_httpServer.AddStreamHandler(
107	new RestDeserialisehandler<Guid, List<InventoryFolderBase>>("POST", "/RootFolders/",	110	new RestDeserialisehandler<Guid, List<InventoryFolderBase>>
108	m_inventoryService.RequestFirstLevelFolders));	111	("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
109		112
110	// httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));	113	// httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));
111	}	114	}