diff options
author | Diva Canto | 2009-08-22 10:24:26 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-22 10:24:26 -0700 |
commit | b03eeeb9f6331ed36c61f55aef847ce3b2db7ba4 (patch) | |
tree | ac9eb8fc50943d35268cc56d67b1a3f38cf705b3 /OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-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/Services/Connectors/Inventory/InventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index 7c35bde..423ca75 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
@@ -308,6 +308,25 @@ namespace OpenSim.Services.Connectors | |||
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | 310 | ||
311 | public bool DeleteFolders(string userID, List<UUID> folderIDs, UUID sessionID) | ||
312 | { | ||
313 | try | ||
314 | { | ||
315 | List<Guid> guids = new List<Guid>(); | ||
316 | foreach (UUID u in folderIDs) | ||
317 | guids.Add(u.Guid); | ||
318 | return SynchronousRestSessionObjectPoster<List<Guid>, bool>.BeginPostObject( | ||
319 | "POST", m_ServerURI + "/DeleteFolders/", guids, sessionID.ToString(), userID); | ||
320 | } | ||
321 | catch (Exception e) | ||
322 | { | ||
323 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory folders operation failed, {0} {1}", | ||
324 | e.Source, e.Message); | ||
325 | } | ||
326 | |||
327 | return false; | ||
328 | } | ||
329 | |||
311 | public bool MoveFolder(string userID, InventoryFolderBase folder, UUID sessionID) | 330 | public bool MoveFolder(string userID, InventoryFolderBase folder, UUID sessionID) |
312 | { | 331 | { |
313 | try | 332 | try |
@@ -481,12 +500,12 @@ namespace OpenSim.Services.Connectors | |||
481 | return null; | 500 | return null; |
482 | } | 501 | } |
483 | 502 | ||
484 | public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase item, UUID sessionID) | 503 | public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase folder, UUID sessionID) |
485 | { | 504 | { |
486 | try | 505 | try |
487 | { | 506 | { |
488 | return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject( | 507 | return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject( |
489 | "POST", m_ServerURI + "/QueryFolder/", item, sessionID.ToString(), item.Owner.ToString()); | 508 | "POST", m_ServerURI + "/QueryFolder/", folder, sessionID.ToString(), userID); |
490 | } | 509 | } |
491 | catch (Exception e) | 510 | catch (Exception e) |
492 | { | 511 | { |