aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService
diff options
context:
space:
mode:
authorMelanie2012-11-03 15:38:47 +0000
committerMelanie2012-11-03 15:38:47 +0000
commitd0473b73da024c67cb1eb4a420e5ce6de59c5da4 (patch)
tree65ddc795b413c661f20f03bbe434e0194a8af6d5 /OpenSim/Services/HypergridService
parentMerge branch 'master' into careminster (diff)
parentHG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ... (diff)
downloadopensim-SC_OLD-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.zip
opensim-SC_OLD-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.gz
opensim-SC_OLD-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.bz2
opensim-SC_OLD-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r--OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 556a0da..677bd7b 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.HypergridService
71 m_ConfigName = configName; 71 m_ConfigName = configName;
72 72
73 if (m_Database == null) 73 if (m_Database == null)
74 m_log.WarnFormat("[XXX]: m_Database is null!"); 74 m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: m_Database is null!");
75 75
76 // 76 //
77 // Try reading the [InventoryService] section, if it exists 77 // Try reading the [InventoryService] section, if it exists
@@ -301,7 +301,7 @@ namespace OpenSim.Services.HypergridService
301 301
302 public override bool AddFolder(InventoryFolderBase folder) 302 public override bool AddFolder(InventoryFolderBase folder)
303 { 303 {
304 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID); 304 //m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
305 // Let's do a bit of sanity checking, more than the base service does 305 // Let's do a bit of sanity checking, more than the base service does
306 // make sure the given folder's parent folder exists under the suitcase tree of this user 306 // make sure the given folder's parent folder exists under the suitcase tree of this user
307 307
@@ -323,7 +323,7 @@ namespace OpenSim.Services.HypergridService
323 323
324 public override bool UpdateFolder(InventoryFolderBase folder) 324 public override bool UpdateFolder(InventoryFolderBase folder)
325 { 325 {
326 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version); 326 //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
327 if (!IsWithinSuitcaseTree(folder.Owner, folder.ID)) 327 if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
328 { 328 {
329 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name); 329 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name);
@@ -584,7 +584,7 @@ namespace OpenSim.Services.HypergridService
584 { 584 {
585 if (a.Wearables[i][j].ItemID == itemID) 585 if (a.Wearables[i][j].ItemID == itemID)
586 { 586 {
587 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); 587 //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID);
588 return true; 588 return true;
589 } 589 }
590 } 590 }
@@ -593,7 +593,7 @@ namespace OpenSim.Services.HypergridService
593 // Check attachments 593 // Check attachments
594 if (a.GetAttachmentForItem(itemID) != null) 594 if (a.GetAttachmentForItem(itemID) != null)
595 { 595 {
596 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); 596 //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID);
597 return true; 597 return true;
598 } 598 }
599 599