diff options
author | Diva Canto | 2009-08-19 00:13:51 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-19 00:13:51 -0700 |
commit | c5af39239f7f2a1725d9c08bea80522de8835e0f (patch) | |
tree | 44469c14f378b9146748f68a51fc82307b38065b /OpenSim/Server | |
parent | GetFolderItems implemented. It's not being called, but it might. (diff) | |
download | opensim-SC-c5af39239f7f2a1725d9c08bea80522de8835e0f.zip opensim-SC-c5af39239f7f2a1725d9c08bea80522de8835e0f.tar.gz opensim-SC-c5af39239f7f2a1725d9c08bea80522de8835e0f.tar.bz2 opensim-SC-c5af39239f7f2a1725d9c08bea80522de8835e0f.tar.xz |
A better purge of trash folder.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs index 30b3cae..6cfc7df 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | |||
@@ -105,8 +105,8 @@ 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", "/DeleteItem/", DeleteItems, CheckAuthSession)); |
110 | 110 | ||
111 | m_httpServer.AddStreamHandler( | 111 | m_httpServer.AddStreamHandler( |
112 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( | 112 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( |
@@ -247,6 +247,15 @@ namespace OpenSim.Server.Handlers.Inventory | |||
247 | return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID); | 247 | return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID); |
248 | } | 248 | } |
249 | 249 | ||
250 | public bool DeleteItems(List<Guid> items) | ||
251 | { | ||
252 | List<UUID> uuids = new List<UUID>(); | ||
253 | foreach (Guid g in items) | ||
254 | uuids.Add(new UUID(g)); | ||
255 | // oops we lost the user info here. Bad bad handlers | ||
256 | return m_InventoryService.DeleteItems(UUID.Zero, uuids); | ||
257 | } | ||
258 | |||
250 | #endregion | 259 | #endregion |
251 | 260 | ||
252 | /// <summary> | 261 | /// <summary> |