aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsReporter.cs10
3 files changed, 8 insertions, 5 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index fa712a7..6658928 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -44,6 +44,7 @@ Patches
44* webmage (International Business Machines Corp.) 44* webmage (International Business Machines Corp.)
45* jimbo2120 (International Business Machines Corp.) 45* jimbo2120 (International Business Machines Corp.)
46* brianw/Sir_Ahzz 46* brianw/Sir_Ahzz
47* ChrisDown
47 48
48 49
49LSL Devs 50LSL Devs
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index c1f6719..e3a4eb8 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Framework.Communications.Cache
395 public void AssetReceived(AssetBase asset, bool IsTexture) 395 public void AssetReceived(AssetBase asset, bool IsTexture)
396 { 396 {
397 #if DEBUG 397 #if DEBUG
398 m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID); 398 m_log.DebugFormat("[ASSET CACHE]: Received {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID);
399 #endif 399 #endif
400 400
401 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server 401 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 acf2ecb..a9a4b4e 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Statistics
103 public string Report() 103 public string Report()
104 { 104 {
105 StringBuilder sb = new StringBuilder(Environment.NewLine); 105 StringBuilder sb = new StringBuilder(Environment.NewLine);
106 sb.Append("PACKET QUEUE STATISTICS"); 106 sb.Append("ASSET CACHE STATISTICS");
107 sb.Append(Environment.NewLine); 107 sb.Append(Environment.NewLine);
108 sb.Append( 108 sb.Append(
109 string.Format( 109 string.Format(
@@ -115,9 +115,11 @@ Texture cache contains {2,6} textures using {3,10:0.000}K" + Environment.NewLine
115 sb.Append(Environment.NewLine); 115 sb.Append(Environment.NewLine);
116 sb.Append("PACKET QUEUE STATISTICS"); 116 sb.Append("PACKET QUEUE STATISTICS");
117 sb.Append(Environment.NewLine); 117 sb.Append(Environment.NewLine);
118 sb.Append("Agent UUID "); 118 sb.Append("Agent UUID ");
119 sb.Append(" Send In Out Resend "); 119 sb.Append(
120 sb.Append(" Land Wind Cloud Task Texture Asset"); 120 string.Format(
121 " {0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7}",
122 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset"));
121 sb.Append(Environment.NewLine); 123 sb.Append(Environment.NewLine);
122 124
123 foreach (LLUUID key in packetQueueStatsReporters.Keys) 125 foreach (LLUUID key in packetQueueStatsReporters.Keys)