diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs index b458b18f3c..33681fd044 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs @@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Cache // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary transactions.XferUploaders.Remove(uploader.TransactionID); - m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count)); + //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count)); } } } diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index c54dd7dcc7..3799510678 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs @@ -108,14 +108,14 @@ namespace OpenSim.Framework.Communications.Cache // Remove the uploader once the uploader is complete if (uploaderFound != null) { - m_log.Info( - String.Format( - "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", - xferID, uploaderFound.TransactionID)); +// m_log.Info( +// String.Format( +// "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", +// xferID, uploaderFound.TransactionID)); XferUploaders.Remove(uploaderFound.TransactionID); - m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count)); + //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count)); } } } diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index 6b1ba39cd7..1835d184fc 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs @@ -15,7 +15,7 @@ namespace OpenSim.Framework.Console override protected void Append(LoggingEvent le) { string loggingMessage = RenderLoggingEvent(le); - string regex = @"^(?.*?)\[(?\w+)\]:?(?.*)"; + string regex = @"^(?.*?)\[(?[^\]]+)\]:?(?.*)"; Regex RE = new Regex(regex, RegexOptions.Multiline); MatchCollection matches = RE.Matches(loggingMessage); @@ -44,7 +44,7 @@ namespace OpenSim.Framework.Console } else { - System.Console.WriteLine(loggingMessage); + System.Console.Write(loggingMessage); } } @@ -79,4 +79,4 @@ namespace OpenSim.Framework.Console } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index 7036de9324..5d8234ad05 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs @@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack /// public virtual void CloseClient(IClientAPI client) { - m_log.Info("PacketServer:CloseClient()"); + //m_log.Info("PacketServer:CloseClient()"); CloseCircuit(client.CircuitCode); m_scene.ClientManager.Remove(client.CircuitCode);