aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-26 01:32:12 +0100
committerJustin Clark-Casey (justincc)2011-05-27 01:36:53 +0100
commitb60ce71b2c8e8f8151d0bfe4de7a4e7f9c40f0be (patch)
tree5496a5af69f10c20bf3c6fafdf685198fef73064 /OpenSim
parentAllow item links to be deleted even when other deletes and purges are disabled. (diff)
downloadopensim-SC_OLD-b60ce71b2c8e8f8151d0bfe4de7a4e7f9c40f0be.zip
opensim-SC_OLD-b60ce71b2c8e8f8151d0bfe4de7a4e7f9c40f0be.tar.gz
opensim-SC_OLD-b60ce71b2c8e8f8151d0bfe4de7a4e7f9c40f0be.tar.bz2
opensim-SC_OLD-b60ce71b2c8e8f8151d0bfe4de7a4e7f9c40f0be.tar.xz
fix bug where outfit folder links could not be deleted
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index a094a02..26af86c 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -40,9 +40,9 @@ namespace OpenSim.Services.InventoryService
40{ 40{
41 public class XInventoryService : ServiceBase, IInventoryService 41 public class XInventoryService : ServiceBase, IInventoryService
42 { 42 {
43 private static readonly ILog m_log = 43// private static readonly ILog m_log =
44 LogManager.GetLogger( 44// LogManager.GetLogger(
45 MethodBase.GetCurrentMethod().DeclaringType); 45// MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 protected IXInventoryData m_Database; 47 protected IXInventoryData m_Database;
48 protected bool m_AllowDelete = true; 48 protected bool m_AllowDelete = true;
@@ -420,7 +420,7 @@ namespace OpenSim.Services.InventoryService
420 { 420 {
421 if (!m_Database.DeleteItems( 421 if (!m_Database.DeleteItems(
422 new string[] { "inventoryID", "assetType" }, 422 new string[] { "inventoryID", "assetType" },
423 new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() })); 423 new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() }))
424 { 424 {
425 m_Database.DeleteItems( 425 m_Database.DeleteItems(
426 new string[] { "inventoryID", "assetType" }, 426 new string[] { "inventoryID", "assetType" },