diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs index 30b3cae..998b322 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | |||
@@ -105,8 +105,12 @@ namespace OpenSim.Server.Handlers.Inventory | |||
105 | "POST", "/PurgeFolder/", m_InventoryService.PurgeFolder, CheckAuthSession)); | 105 | "POST", "/PurgeFolder/", m_InventoryService.PurgeFolder, CheckAuthSession)); |
106 | 106 | ||
107 | m_httpServer.AddStreamHandler( | 107 | m_httpServer.AddStreamHandler( |
108 | new RestDeserialiseSecureHandler<InventoryItemBase, bool>( | 108 | new RestDeserialiseSecureHandler<List<Guid>, bool>( |
109 | "POST", "/DeleteItem/", m_InventoryService.DeleteItem, CheckAuthSession)); | 109 | "POST", "/DeleteFolders/", DeleteFolders, CheckAuthSession)); |
110 | |||
111 | m_httpServer.AddStreamHandler( | ||
112 | new RestDeserialiseSecureHandler<List<Guid>, bool>( | ||
113 | "POST", "/DeleteItem/", DeleteItems, CheckAuthSession)); | ||
110 | 114 | ||
111 | m_httpServer.AddStreamHandler( | 115 | m_httpServer.AddStreamHandler( |
112 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( | 116 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( |
@@ -125,8 +129,8 @@ namespace OpenSim.Server.Handlers.Inventory | |||
125 | "POST", "/NewFolder/", m_InventoryService.AddFolder, CheckAuthSession)); | 129 | "POST", "/NewFolder/", m_InventoryService.AddFolder, CheckAuthSession)); |
126 | 130 | ||
127 | m_httpServer.AddStreamHandler( | 131 | m_httpServer.AddStreamHandler( |
128 | new RestDeserialiseTrustedHandler<InventoryFolderBase, bool>( | 132 | new RestDeserialiseSecureHandler<InventoryFolderBase, bool>( |
129 | "POST", "/CreateFolder/", m_InventoryService.AddFolder, CheckTrustSource)); | 133 | "POST", "/CreateFolder/", m_InventoryService.AddFolder, CheckAuthSession)); |
130 | 134 | ||
131 | m_httpServer.AddStreamHandler( | 135 | m_httpServer.AddStreamHandler( |
132 | new RestDeserialiseSecureHandler<InventoryItemBase, bool>( | 136 | new RestDeserialiseSecureHandler<InventoryItemBase, bool>( |
@@ -137,9 +141,16 @@ namespace OpenSim.Server.Handlers.Inventory | |||
137 | "POST", "/AddNewItem/", m_InventoryService.AddItem, CheckTrustSource)); | 141 | "POST", "/AddNewItem/", m_InventoryService.AddItem, CheckTrustSource)); |
138 | 142 | ||
139 | m_httpServer.AddStreamHandler( | 143 | m_httpServer.AddStreamHandler( |
140 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>>( | 144 | new RestDeserialiseSecureHandler<Guid, List<InventoryItemBase>>( |
141 | "POST", "/GetItems/", GetFolderItems, CheckTrustSource)); | 145 | "POST", "/GetItems/", GetFolderItems, CheckAuthSession)); |
142 | 146 | ||
147 | m_httpServer.AddStreamHandler( | ||
148 | new RestDeserialiseSecureHandler<List<InventoryItemBase>, bool>( | ||
149 | "POST", "/MoveItems/", MoveItems, CheckAuthSession)); | ||
150 | |||
151 | m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService)); | ||
152 | |||
153 | |||
143 | // for persistent active gestures | 154 | // for persistent active gestures |
144 | m_httpServer.AddStreamHandler( | 155 | m_httpServer.AddStreamHandler( |
145 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> | 156 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> |
@@ -247,6 +258,33 @@ namespace OpenSim.Server.Handlers.Inventory | |||
247 | return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID); | 258 | return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID); |
248 | } | 259 | } |
249 | 260 | ||
261 | public bool DeleteFolders(List<Guid> items) | ||
262 | { | ||
263 | List<UUID> uuids = new List<UUID>(); | ||
264 | foreach (Guid g in items) | ||
265 | uuids.Add(new UUID(g)); | ||
266 | // oops we lost the user info here. Bad bad handlers | ||
267 | return m_InventoryService.DeleteFolders(UUID.Zero, uuids); | ||
268 | } | ||
269 | |||
270 | public bool DeleteItems(List<Guid> items) | ||
271 | { | ||
272 | List<UUID> uuids = new List<UUID>(); | ||
273 | foreach (Guid g in items) | ||
274 | uuids.Add(new UUID(g)); | ||
275 | // oops we lost the user info here. Bad bad handlers | ||
276 | return m_InventoryService.DeleteItems(UUID.Zero, uuids); | ||
277 | } | ||
278 | |||
279 | public bool MoveItems(List<InventoryItemBase> items) | ||
280 | { | ||
281 | // oops we lost the user info here. Bad bad handlers | ||
282 | // let's peek at one item | ||
283 | UUID ownerID = UUID.Zero; | ||
284 | if (items.Count > 0) | ||
285 | ownerID = items[0].Owner; | ||
286 | return m_InventoryService.MoveItems(ownerID, items); | ||
287 | } | ||
250 | #endregion | 288 | #endregion |
251 | 289 | ||
252 | /// <summary> | 290 | /// <summary> |