From a1a206cb056e68ea30105f8aef91efb017d8426e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 13 Feb 2008 02:43:41 +0000 Subject: * Clean up LIBRARY INVENTORY messages --- .../Communications/Cache/LibraryRootFolder.cs | 25 +++++++++++----------- OpenSim/Region/ClientStack/ClientView.cs | 8 +++---- 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 46767bb..604cd2c 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache public LibraryRootFolder() { - m_log.Info("[LIBRARYINVENTORY]: Loading library inventory"); + m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); agentID = libOwner; folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); @@ -141,7 +141,8 @@ namespace OpenSim.Framework.Communications.Cache protected void LoadLibraries(string librariesControlPath) { m_log.Info( - String.Format("LIBRARYINVENTORY", "Loading libraries control file {0}", librariesControlPath)); + String.Format( + "[LIBRARY INVENTORY]: Loading libraries control file {0}", librariesControlPath)); LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig); } @@ -189,14 +190,13 @@ namespace OpenSim.Framework.Communications.Cache parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); // m_log.Info( -// String.Format("[LIBRARYINVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID)); +// String.Format("[LIBRARY INVENTORY]: Adding folder {0} ({1})", folderInfo.name, folderInfo.folderID)); } else { - m_log.Warn( - String.Format("[LIBRARYINVENTORY]: " + - "Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", - folderInfo.name, folderInfo.folderID, folderInfo.parentID)); + m_log.WarnFormat( + "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", + folderInfo.name, folderInfo.folderID, folderInfo.parentID); } } @@ -229,10 +229,9 @@ namespace OpenSim.Framework.Communications.Cache } else { - m_log.Warn( - String.Format("[LIBRARYINVENTORY]: " + - "Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!", - item.inventoryName, item.inventoryID, item.parentFolderID)); + m_log.WarnFormat( + "[LIBRARY INVENTORY]: Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!", + item.inventoryName, item.inventoryID, item.parentFolderID); } } @@ -260,13 +259,13 @@ namespace OpenSim.Framework.Communications.Cache catch (XmlException e) { m_log.Error( - String.Format("[LIBRARYINVENTORY]: Error loading {0} : {1}", path, e)); + String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e)); } } else { m_log.Error( - String.Format("[LIBRARYINVENTORY]: {0} file {1} does not exist!", fileDescription, path)); + String.Format("[LIBRARY INVENTORY]: {0} file {1} does not exist!", fileDescription, path)); } } diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 58405e6..4d00c5b 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -51,10 +51,10 @@ namespace OpenSim.Region.ClientStack /// public class ClientView : IClientAPI { - // ~ClientView() - // { - // System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); - // } +// ~ClientView() +// { +// System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); +// } private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); -- cgit v1.1