OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allowing the expected purge trash folder... 

Please validate !!!
avinationmerge
sacha 2010-08-06 14:38:11 +00:00
parent 0a004f8c44
commit a390541e1c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset
byte[] HandlePurgeFolder(Dictionary<string,object> request) byte[] HandlePurgeFolder(Dictionary<string,object> request)
{ {
Dictionary<string,object> result = new Dictionary<string,object>(); Dictionary<string,object> result = new Dictionary<string,object>();
UUID folderID = UUID.Zero; UUID folderID = UUID.Zero;
UUID.TryParse(request["ID"].ToString(), out folderID); UUID.TryParse(request["ID"].ToString(), out folderID);

5
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -329,8 +329,8 @@ namespace OpenSim.Services.InventoryService
if (!m_AllowDelete) if (!m_AllowDelete)
return false; return false;
if (!ParentIsTrash(folder.ID)) // if (!ParentIsTrash(folder.ID))
return false; // return false;
XInventoryFolder[] subFolders = m_Database.GetFolders( XInventoryFolder[] subFolders = m_Database.GetFolders(
new string[] { "parentFolderID" }, new string[] { "parentFolderID" },
@ -342,6 +342,7 @@ namespace OpenSim.Services.InventoryService
m_Database.DeleteFolders("folderID", x.folderID.ToString()); m_Database.DeleteFolders("folderID", x.folderID.ToString());
} }
if (!ParentIsTrash(folder.ID))
m_Database.DeleteItems("parentFolderID", folder.ID.ToString()); m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
return true; return true;