From 74e5fe5aa94aa338c0e574553ccabd42a93b0bbd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 23 Aug 2010 22:24:23 +0100
Subject: Remove various warnings and improve logging messages. No functional
changes.
---
.../ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | 3 ---
.../CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | 7 +++++++
.../Inventory/LocalInventoryServiceConnector.cs | 5 ++++-
.../Inventory/RemoteInventoryServiceConnector.cs | 1 -
4 files changed, 11 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory')
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 @@
using System;
using System.Collections.Generic;
-
using OpenMetaverse;
using Nini.Config;
using log4net;
-
using OpenSim.Framework;
using OpenSim.Services.Interfaces;
-
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
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
///
public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
{
+ m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
+
Dictionary folders = null;
lock (m_InventoryCache)
@@ -177,8 +179,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
if ((folders != null) && folders.ContainsKey(type))
{
+ m_log.DebugFormat(
+ "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
+
return folders[type];
}
+
+ m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);
return null;
}
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
/// true if the item was successfully added
public bool AddItem(InventoryItemBase item)
{
+ m_log.DebugFormat(
+ "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}",
+ item.Name, item.Owner, item.Folder);
+
return m_InventoryService.AddItem(item);
}
@@ -236,7 +240,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_InventoryService.UpdateItem(item);
}
-
public bool MoveItems(UUID ownerID, List items)
{
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
base.Init(source);
}
-
#region ISharedRegionModule
public void Initialise(IConfigSource source)
--
cgit v1.1