aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2009-08-22 10:24:26 -0700
committerDiva Canto2009-08-22 10:24:26 -0700
commitb03eeeb9f6331ed36c61f55aef847ce3b2db7ba4 (patch)
treeac9eb8fc50943d35268cc56d67b1a3f38cf705b3 /OpenSim/Server
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4.zip
opensim-SC_OLD-b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4.tar.gz
opensim-SC_OLD-b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4.tar.bz2
opensim-SC_OLD-b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4.tar.xz
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044. Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
* Removed left-overs from AssetInventoryServer.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 10336b0..998b322 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -106,6 +106,10 @@ namespace OpenSim.Server.Handlers.Inventory
106 106
107 m_httpServer.AddStreamHandler( 107 m_httpServer.AddStreamHandler(
108 new RestDeserialiseSecureHandler<List<Guid>, bool>( 108 new RestDeserialiseSecureHandler<List<Guid>, bool>(
109 "POST", "/DeleteFolders/", DeleteFolders, CheckAuthSession));
110
111 m_httpServer.AddStreamHandler(
112 new RestDeserialiseSecureHandler<List<Guid>, bool>(
109 "POST", "/DeleteItem/", DeleteItems, CheckAuthSession)); 113 "POST", "/DeleteItem/", DeleteItems, CheckAuthSession));
110 114
111 m_httpServer.AddStreamHandler( 115 m_httpServer.AddStreamHandler(
@@ -254,6 +258,15 @@ namespace OpenSim.Server.Handlers.Inventory
254 return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID); 258 return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID);
255 } 259 }
256 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
257 public bool DeleteItems(List<Guid> items) 270 public bool DeleteItems(List<Guid> items)
258 { 271 {
259 List<UUID> uuids = new List<UUID>(); 272 List<UUID> uuids = new List<UUID>();