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

reverese my last commit

avinationmerge
sacha 2010-08-06 14:45:54 +00:00
parent 23d1f0978e
commit 5da272d042
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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,8 +342,6 @@ 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());
return true; return true;
} }