diff options
4 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs index b458b18..33681fd 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | |||
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
106 | // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary | 106 | // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary |
107 | transactions.XferUploaders.Remove(uploader.TransactionID); | 107 | transactions.XferUploaders.Remove(uploader.TransactionID); |
108 | 108 | ||
109 | m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count)); | 109 | //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count)); |
110 | } | 110 | } |
111 | } | 111 | } |
112 | } | 112 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index c54dd7d..3799510 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
@@ -108,14 +108,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
108 | // Remove the uploader once the uploader is complete | 108 | // Remove the uploader once the uploader is complete |
109 | if (uploaderFound != null) | 109 | if (uploaderFound != null) |
110 | { | 110 | { |
111 | m_log.Info( | 111 | // m_log.Info( |
112 | String.Format( | 112 | // String.Format( |
113 | "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", | 113 | // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", |
114 | xferID, uploaderFound.TransactionID)); | 114 | // xferID, uploaderFound.TransactionID)); |
115 | 115 | ||
116 | XferUploaders.Remove(uploaderFound.TransactionID); | 116 | XferUploaders.Remove(uploaderFound.TransactionID); |
117 | 117 | ||
118 | m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count)); | 118 | //m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count)); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | } | 121 | } |
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index 6b1ba39..1835d18 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs | |||
@@ -15,7 +15,7 @@ namespace OpenSim.Framework.Console | |||
15 | override protected void Append(LoggingEvent le) | 15 | override protected void Append(LoggingEvent le) |
16 | { | 16 | { |
17 | string loggingMessage = RenderLoggingEvent(le); | 17 | string loggingMessage = RenderLoggingEvent(le); |
18 | string regex = @"^(?<Front>.*?)\[(?<Category>\w+)\]:?(?<End>.*)"; | 18 | string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; |
19 | 19 | ||
20 | Regex RE = new Regex(regex, RegexOptions.Multiline); | 20 | Regex RE = new Regex(regex, RegexOptions.Multiline); |
21 | MatchCollection matches = RE.Matches(loggingMessage); | 21 | MatchCollection matches = RE.Matches(loggingMessage); |
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Console | |||
44 | } | 44 | } |
45 | else | 45 | else |
46 | { | 46 | { |
47 | System.Console.WriteLine(loggingMessage); | 47 | System.Console.Write(loggingMessage); |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
@@ -79,4 +79,4 @@ namespace OpenSim.Framework.Console | |||
79 | } | 79 | } |
80 | 80 | ||
81 | } | 81 | } |
82 | } \ No newline at end of file | 82 | } |
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index 7036de93..5d8234a 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs | |||
@@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack | |||
141 | /// <param name="client"></param> | 141 | /// <param name="client"></param> |
142 | public virtual void CloseClient(IClientAPI client) | 142 | public virtual void CloseClient(IClientAPI client) |
143 | { | 143 | { |
144 | m_log.Info("PacketServer:CloseClient()"); | 144 | //m_log.Info("PacketServer:CloseClient()"); |
145 | 145 | ||
146 | CloseCircuit(client.CircuitCode); | 146 | CloseCircuit(client.CircuitCode); |
147 | m_scene.ClientManager.Remove(client.CircuitCode); | 147 | m_scene.ClientManager.Remove(client.CircuitCode); |