aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-23 17:25:40 +0100
committerMelanie2012-10-23 17:25:40 +0100
commit484eca323b0e89b2da0c8c9404c1b9bf3a99945b (patch)
treec34f9cb43efd64fa26ac1ab2f676f0dc6f86fe8a /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentBulletSim: remove chatty debug message. (diff)
downloadopensim-SC-484eca323b0e89b2da0c8c9404c1b9bf3a99945b.zip
opensim-SC-484eca323b0e89b2da0c8c9404c1b9bf3a99945b.tar.gz
opensim-SC-484eca323b0e89b2da0c8c9404c1b9bf3a99945b.tar.bz2
opensim-SC-484eca323b0e89b2da0c8c9404c1b9bf3a99945b.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 0d359b9..5398ab9 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -246,11 +246,13 @@ namespace OpenSim.Region.Framework.Scenes
246 = new Stat( 246 = new Stat(
247 "SlowFrames", 247 "SlowFrames",
248 "Slow Frames", 248 "Slow Frames",
249 "Number of frames where frame time has been significantly longer than the desired frame time.",
249 " frames", 250 " frames",
250 "scene", 251 "scene",
251 m_scene.Name, 252 m_scene.Name,
252 StatVerbosity.Info, 253 StatType.Push,
253 "Number of frames where frame time has been significantly longer than the desired frame time."); 254 null,
255 StatVerbosity.Info);
254 256
255 StatsManager.RegisterStat(SlowFramesStat); 257 StatsManager.RegisterStat(SlowFramesStat);
256 } 258 }