aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService
diff options
context:
space:
mode:
authorMelanie2012-06-03 02:36:28 +0100
committerMelanie2012-06-03 02:36:28 +0100
commit728249ba49bd64cb9d5540fa3ed9bca06652d7d4 (patch)
tree96f680719edca41e8703b714e17b1e755b0ff104 /OpenSim/Services/InventoryService
parentMerge branch 'avination' into careminster (diff)
parentFix build break whree accidentally did inv.Folders rather than inv.Folders.Co... (diff)
downloadopensim-SC_OLD-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.zip
opensim-SC_OLD-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.gz
opensim-SC_OLD-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.bz2
opensim-SC_OLD-728249ba49bd64cb9d5540fa3ed9bca06652d7d4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 3355428..7518b86 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -436,7 +436,7 @@ namespace OpenSim.Services.InventoryService
436 public virtual bool AddItem(InventoryItemBase item) 436 public virtual bool AddItem(InventoryItemBase item)
437 { 437 {
438// m_log.DebugFormat( 438// m_log.DebugFormat(
439// "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner); 439// "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner);
440 440
441 return m_Database.StoreItem(ConvertFromOpenSim(item)); 441 return m_Database.StoreItem(ConvertFromOpenSim(item));
442 } 442 }