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

refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance 

These overloads are not publicly available on core connectors or IInventoryService.
0.7.4.1
Justin Clark-Casey (justincc) 2012-05-04 20:37:21 +01:00
parent ad23774433
commit e83bc049df
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ namespace OpenSim.Services.InventoryService
: this(config, "InventoryService") : this(config, "InventoryService")
{ {
} }
public XInventoryService(IConfigSource config, string configName) : base(config) public XInventoryService(IConfigSource config, string configName) : base(config)
{ {
if (configName != string.Empty) if (configName != string.Empty)
@ -364,10 +365,10 @@ namespace OpenSim.Services.InventoryService
// //
public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs) public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
{ {
return DeleteFoldersEx(principalID, folderIDs, true); return DeleteFolders(principalID, folderIDs, true);
} }
public bool DeleteFoldersEx(UUID principalID, List<UUID> folderIDs, bool onlyIfTrash) public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs, bool onlyIfTrash)
{ {
if (!m_AllowDelete) if (!m_AllowDelete)
return false; return false;
@ -381,7 +382,7 @@ namespace OpenSim.Services.InventoryService
//m_log.InfoFormat("[XINVENTORY SERVICE]: Delete folder {0}", id); //m_log.InfoFormat("[XINVENTORY SERVICE]: Delete folder {0}", id);
InventoryFolderBase f = new InventoryFolderBase(); InventoryFolderBase f = new InventoryFolderBase();
f.ID = id; f.ID = id;
PurgeFolderEx(f, onlyIfTrash); PurgeFolder(f, onlyIfTrash);
m_Database.DeleteFolders("folderID", id.ToString()); m_Database.DeleteFolders("folderID", id.ToString());
} }
@ -390,10 +391,10 @@ namespace OpenSim.Services.InventoryService
public virtual bool PurgeFolder(InventoryFolderBase folder) public virtual bool PurgeFolder(InventoryFolderBase folder)
{ {
return PurgeFolderEx(folder, true); return PurgeFolder(folder, true);
} }
private bool PurgeFolderEx(InventoryFolderBase folder, bool onlyIfTrash) public virtual bool PurgeFolder(InventoryFolderBase folder, bool onlyIfTrash)
{ {
if (!m_AllowDelete) if (!m_AllowDelete)
return false; return false;
@ -407,7 +408,7 @@ namespace OpenSim.Services.InventoryService
foreach (XInventoryFolder x in subFolders) foreach (XInventoryFolder x in subFolders)
{ {
PurgeFolderEx(ConvertToOpenSim(x), onlyIfTrash); PurgeFolder(ConvertToOpenSim(x), onlyIfTrash);
m_Database.DeleteFolders("folderID", x.folderID.ToString()); m_Database.DeleteFolders("folderID", x.folderID.ToString());
} }