aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs7
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs5
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
3 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 33d820d..5f532e0 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -26,12 +26,17 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29//using System.Reflection;
30
29using libsecondlife; 31using libsecondlife;
32//using log4net;
30 33
31namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
32{ 35{
33 public class InventoryFolderImpl : InventoryFolderBase 36 public class InventoryFolderImpl : InventoryFolderBase
34 { 37 {
38 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
35 // Fields 40 // Fields
36 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); 41 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();
37 public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); 42 public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>();
@@ -200,6 +205,8 @@ namespace OpenSim.Framework.Communications.Cache
200 } 205 }
201 } 206 }
202 207
208 //m_log.DebugFormat("[INVENTORY FOLDER IMPL]: Found {0} items", itemList.Count);
209
203 return itemList; 210 return itemList;
204 } 211 }
205 212
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 1e3dbb6..ec06a23 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -47,8 +47,7 @@ namespace OpenSim.Framework.Communications.Cache
47 /// </summary> 47 /// </summary>
48 public class UserProfileCacheService 48 public class UserProfileCacheService
49 { 49 {
50 private static readonly ILog m_log 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 51
53 /// <summary> 52 /// <summary>
54 /// The comms manager holds references to services (user, grid, inventory, etc.) 53 /// The comms manager holds references to services (user, grid, inventory, etc.)
@@ -416,6 +415,8 @@ namespace OpenSim.Framework.Communications.Cache
416 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 415 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID,
417 bool fetchFolders, bool fetchItems, int sortOrder) 416 bool fetchFolders, bool fetchItems, int sortOrder)
418 { 417 {
418 //m_log.DebugFormat("[INVENTORY CACHE]: Fetching folders/items from {0} for agent {1}", folderID, agentID);
419
419 // XXX We're not handling sortOrder yet! 420 // XXX We're not handling sortOrder yet!
420 421
421 InventoryFolderImpl fold = null; 422 InventoryFolderImpl fold = null;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 5b72f0d..b1816d0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Region.Communications.OGS1
239 } 239 }
240 catch (System.Net.WebException e) 240 catch (System.Net.WebException e)
241 { 241 {
242 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", 242 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
243 e.Source, e.Message); 243 e.Source, e.Message);
244 } 244 }
245 } 245 }