diff options
Diffstat (limited to 'OpenSim/Framework/Statistics/SimExtraStatsCollector.cs')
-rw-r--r-- | OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 506db31..7a74e72 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Statistics | |||
36 | /// <summary> | 36 | /// <summary> |
37 | /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane | 37 | /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane |
38 | /// </summary> | 38 | /// </summary> |
39 | public class SimExtraStatsCollector : IStatsCollector | 39 | public class SimExtraStatsCollector : BaseStatsCollector |
40 | { | 40 | { |
41 | private long abnormalClientThreadTerminations; | 41 | private long abnormalClientThreadTerminations; |
42 | 42 | ||
@@ -140,14 +140,14 @@ namespace OpenSim.Framework.Statistics | |||
140 | /// Report back collected statistical information. | 140 | /// Report back collected statistical information. |
141 | /// </summary> | 141 | /// </summary> |
142 | /// <returns></returns> | 142 | /// <returns></returns> |
143 | public string Report() | 143 | public override string Report() |
144 | { | 144 | { |
145 | StringBuilder sb = new StringBuilder(Environment.NewLine); | 145 | StringBuilder sb = new StringBuilder(Environment.NewLine); |
146 | sb.Append("ASSET STATISTICS"); | 146 | sb.Append("ASSET STATISTICS"); |
147 | sb.Append(Environment.NewLine); | 147 | sb.Append(Environment.NewLine); |
148 | sb.Append( | 148 | sb.Append( |
149 | string.Format( | 149 | string.Format( |
150 | @"Asset cache contains {0,6} assets using {1,10:0.000}K" + Environment.NewLine, | 150 | @"Asset cache contains {0,6} assets using {1,10:0.000} K" + Environment.NewLine, |
151 | AssetsInCache, AssetCacheMemoryUsage / 1024.0)); | 151 | AssetsInCache, AssetCacheMemoryUsage / 1024.0)); |
152 | 152 | ||
153 | sb.Append(Environment.NewLine); | 153 | sb.Append(Environment.NewLine); |
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Statistics | |||
155 | sb.Append(Environment.NewLine); | 155 | sb.Append(Environment.NewLine); |
156 | sb.Append( | 156 | sb.Append( |
157 | string.Format( | 157 | string.Format( |
158 | @"Texture cache contains {0,6} textures using {1,10:0.000}K | 158 | @"Texture cache contains {0,6} textures using {1,10:0.000} K |
159 | Blocked requests for missing textures: {2}" + Environment.NewLine, | 159 | Blocked requests for missing textures: {2}" + Environment.NewLine, |
160 | TexturesInCache, TextureCacheMemoryUsage / 1024.0, | 160 | TexturesInCache, TextureCacheMemoryUsage / 1024.0, |
161 | BlockedMissingTextureRequests)); | 161 | BlockedMissingTextureRequests)); |
@@ -193,6 +193,8 @@ Blocked requests for missing textures: {2}" + Environment.NewLine, | |||
193 | sb.Append(Environment.NewLine); | 193 | sb.Append(Environment.NewLine); |
194 | } | 194 | } |
195 | 195 | ||
196 | sb.Append(base.Report()); | ||
197 | |||
196 | return sb.ToString(); | 198 | return sb.ToString(); |
197 | } | 199 | } |
198 | } | 200 | } |