diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Services/InventoryService/XInventoryService.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 58c59eb..eeab67a 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; |
| @@ -385,8 +385,8 @@ namespace OpenSim.Services.InventoryService | |||
| 385 | 385 | ||
| 386 | public virtual bool AddItem(InventoryItemBase item) | 386 | public virtual bool AddItem(InventoryItemBase item) |
| 387 | { | 387 | { |
| 388 | // m_log.DebugFormat( | 388 | //m_log.DebugFormat( |
| 389 | // "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner); | 389 | // "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner); |
| 390 | 390 | ||
| 391 | return m_Database.StoreItem(ConvertFromOpenSim(item)); | 391 | return m_Database.StoreItem(ConvertFromOpenSim(item)); |
| 392 | } | 392 | } |