diff options
author | Justin Clarke Casey | 2008-04-30 19:08:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-30 19:08:48 +0000 |
commit | 9817363b9340cb4f918f4e1ca0690f112691113c (patch) | |
tree | fd74b1be0145191f72b9d5800a569e2e9ea76bc2 /OpenSim/Framework/Communications/Cache | |
parent | add a bunch of properties for User Appearance (diff) | |
download | opensim-SC-9817363b9340cb4f918f4e1ca0690f112691113c.zip opensim-SC-9817363b9340cb4f918f4e1ca0690f112691113c.tar.gz opensim-SC-9817363b9340cb4f918f4e1ca0690f112691113c.tar.bz2 opensim-SC-9817363b9340cb4f918f4e1ca0690f112691113c.tar.xz |
* Completely inconsequential inventory odds and ends (actual impact - only one log message changed)
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 5 |
2 files changed, 10 insertions, 2 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 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | //using System.Reflection; | ||
30 | |||
29 | using libsecondlife; | 31 | using libsecondlife; |
32 | //using log4net; | ||
30 | 33 | ||
31 | namespace OpenSim.Framework.Communications.Cache | 34 | namespace 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; |