diff options
Diffstat (limited to '')
4 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs index 1e51187..dcf08e3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | |||
@@ -27,15 +27,12 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | |||
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using log4net; | 32 | using log4net; |
34 | |||
35 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
36 | using OpenSim.Services.Interfaces; | 34 | using OpenSim.Services.Interfaces; |
37 | 35 | ||
38 | |||
39 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | 36 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory |
40 | { | 37 | { |
41 | public abstract class BaseInventoryConnector : IInventoryService | 38 | public abstract class BaseInventoryConnector : IInventoryService |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs index c97ab9e..4e2f602 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | |||
@@ -161,6 +161,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
161 | /// <returns></returns> | 161 | /// <returns></returns> |
162 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | 162 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) |
163 | { | 163 | { |
164 | m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID); | ||
165 | |||
164 | Dictionary<AssetType, InventoryFolderBase> folders = null; | 166 | Dictionary<AssetType, InventoryFolderBase> folders = null; |
165 | 167 | ||
166 | lock (m_InventoryCache) | 168 | lock (m_InventoryCache) |
@@ -177,8 +179,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
177 | 179 | ||
178 | if ((folders != null) && folders.ContainsKey(type)) | 180 | if ((folders != null) && folders.ContainsKey(type)) |
179 | { | 181 | { |
182 | m_log.DebugFormat( | ||
183 | "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID); | ||
184 | |||
180 | return folders[type]; | 185 | return folders[type]; |
181 | } | 186 | } |
187 | |||
188 | m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID); | ||
182 | 189 | ||
183 | return null; | 190 | return null; |
184 | } | 191 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 22bd04c..3de6e5c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -223,6 +223,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
223 | /// <returns>true if the item was successfully added</returns> | 223 | /// <returns>true if the item was successfully added</returns> |
224 | public bool AddItem(InventoryItemBase item) | 224 | public bool AddItem(InventoryItemBase item) |
225 | { | 225 | { |
226 | m_log.DebugFormat( | ||
227 | "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", | ||
228 | item.Name, item.Owner, item.Folder); | ||
229 | |||
226 | return m_InventoryService.AddItem(item); | 230 | return m_InventoryService.AddItem(item); |
227 | } | 231 | } |
228 | 232 | ||
@@ -236,7 +240,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
236 | return m_InventoryService.UpdateItem(item); | 240 | return m_InventoryService.UpdateItem(item); |
237 | } | 241 | } |
238 | 242 | ||
239 | |||
240 | public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) | 243 | public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) |
241 | { | 244 | { |
242 | return m_InventoryService.MoveItems(ownerID, items); | 245 | return m_InventoryService.MoveItems(ownerID, items); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 153aeec..17d80c7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
75 | base.Init(source); | 75 | base.Init(source); |
76 | } | 76 | } |
77 | 77 | ||
78 | |||
79 | #region ISharedRegionModule | 78 | #region ISharedRegionModule |
80 | 79 | ||
81 | public void Initialise(IConfigSource source) | 80 | public void Initialise(IConfigSource source) |