OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Clean up LIBRARY INVENTORY messages

ThreadPoolClientBranch
Justin Clarke Casey 2008-02-13 02:43:41 +00:00
parent 45638cc141
commit a1a206cb05
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Framework.Communications.Cache
public LibraryRootFolder() public LibraryRootFolder()
{ {
m_log.Info("[LIBRARYINVENTORY]: Loading library inventory"); m_log.Info("[LIBRARY INVENTORY]: Loading library inventory");
agentID = libOwner; agentID = libOwner;
folderID = new LLUUID("00000112-000f-0000-0000-000100bba000"); folderID = new LLUUID("00000112-000f-0000-0000-000100bba000");
@ -141,7 +141,8 @@ namespace OpenSim.Framework.Communications.Cache
protected void LoadLibraries(string librariesControlPath) protected void LoadLibraries(string librariesControlPath)
{ {
m_log.Info( 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); LoadFromFile(librariesControlPath, "Libraries control", ReadLibraryFromConfig);
} }
@ -189,14 +190,13 @@ namespace OpenSim.Framework.Communications.Cache
parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo); parentFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
// m_log.Info( // 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 else
{ {
m_log.Warn( m_log.WarnFormat(
String.Format("[LIBRARYINVENTORY]: " + "[LIBRARY INVENTORY]: Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!",
"Couldn't add folder {0} ({1}) since parent folder with ID {2} does not exist!", folderInfo.name, folderInfo.folderID, folderInfo.parentID);
folderInfo.name, folderInfo.folderID, folderInfo.parentID));
} }
} }
@ -229,10 +229,9 @@ namespace OpenSim.Framework.Communications.Cache
} }
else else
{ {
m_log.Warn( m_log.WarnFormat(
String.Format("[LIBRARYINVENTORY]: " + "[LIBRARY INVENTORY]: Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!",
"Couldn't add item {0} ({1}) since parent folder with ID {2} does not exist!", item.inventoryName, item.inventoryID, item.parentFolderID);
item.inventoryName, item.inventoryID, item.parentFolderID));
} }
} }
@ -260,13 +259,13 @@ namespace OpenSim.Framework.Communications.Cache
catch (XmlException e) catch (XmlException e)
{ {
m_log.Error( m_log.Error(
String.Format("[LIBRARYINVENTORY]: Error loading {0} : {1}", path, e)); String.Format("[LIBRARY INVENTORY]: Error loading {0} : {1}", path, e));
} }
} }
else else
{ {
m_log.Error( 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));
} }
} }

8
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -51,10 +51,10 @@ namespace OpenSim.Region.ClientStack
/// </summary> /// </summary>
public class ClientView : IClientAPI public class ClientView : IClientAPI
{ {
// ~ClientView() // ~ClientView()
// { // {
// System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); // System.Console.WriteLine("[CLIENTVIEW]: Destructor called");
// } // }
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);