diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index fa712a7ac1..665892892e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -44,6 +44,7 @@ Patches * webmage (International Business Machines Corp.) * jimbo2120 (International Business Machines Corp.) * brianw/Sir_Ahzz +* ChrisDown LSL Devs diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index c1f6719f05..e3a4eb8193 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -395,7 +395,7 @@ namespace OpenSim.Framework.Communications.Cache public void AssetReceived(AssetBase asset, bool IsTexture) { #if DEBUG - m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); + m_log.DebugFormat("[ASSET CACHE]: Received {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); #endif if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs index acf2ecb961..a9a4b4e453 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs @@ -103,7 +103,7 @@ namespace OpenSim.Framework.Statistics public string Report() { StringBuilder sb = new StringBuilder(Environment.NewLine); - sb.Append("PACKET QUEUE STATISTICS"); + sb.Append("ASSET CACHE STATISTICS"); sb.Append(Environment.NewLine); sb.Append( string.Format( @@ -115,9 +115,11 @@ Texture cache contains {2,6} textures using {3,10:0.000}K" + Environment.NewLine sb.Append(Environment.NewLine); sb.Append("PACKET QUEUE STATISTICS"); sb.Append(Environment.NewLine); - sb.Append("Agent UUID "); - sb.Append(" Send In Out Resend "); - sb.Append(" Land Wind Cloud Task Texture Asset"); + sb.Append("Agent UUID "); + sb.Append( + string.Format( + " {0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7}", + "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset")); sb.Append(Environment.NewLine); foreach (LLUUID key in packetQueueStatsReporters.Keys)