diff options
| author | Melanie | 2011-05-27 01:10:02 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-27 01:10:02 +0100 |
| commit | f02fbdbc681b853d96deb682972702a261fba6f2 (patch) | |
| tree | ede88c909ea73b8459e4060f9e42697d4b4998f4 /OpenSim/Services | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff) | |
| parent | improve help information for "appearance show" (diff) | |
| download | opensim-SC-f02fbdbc681b853d96deb682972702a261fba6f2.zip opensim-SC-f02fbdbc681b853d96deb682972702a261fba6f2.tar.gz opensim-SC-f02fbdbc681b853d96deb682972702a261fba6f2.tar.bz2 opensim-SC-f02fbdbc681b853d96deb682972702a261fba6f2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 8 |
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" }, |