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-26 01:32:36 +0100
commitab855e6f8dbb8edc843aee7c7e82d3fbddb9c4d8 (patch)
treecde4e2f76827c7e4a8d917291492d8d83f4b48b5 /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-ab855e6f8dbb8edc843aee7c7e82d3fbddb9c4d8.zip
opensim-SC-ab855e6f8dbb8edc843aee7c7e82d3fbddb9c4d8.tar.gz
opensim-SC-ab855e6f8dbb8edc843aee7c7e82d3fbddb9c4d8.tar.bz2
opensim-SC-ab855e6f8dbb8edc843aee7c7e82d3fbddb9c4d8.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 2282ee8..58c59eb 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;
@@ -424,7 +424,7 @@ namespace OpenSim.Services.InventoryService
424 { 424 {
425 if (!m_Database.DeleteItems( 425 if (!m_Database.DeleteItems(
426 new string[] { "inventoryID", "assetType" }, 426 new string[] { "inventoryID", "assetType" },
427 new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() })); 427 new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() }))
428 { 428 {
429 m_Database.DeleteItems( 429 m_Database.DeleteItems(
430 new string[] { "inventoryID", "assetType" }, 430 new string[] { "inventoryID", "assetType" },