diff options
| author | Melanie | 2013-09-01 22:49:31 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-01 22:49:31 +0100 |
| commit | 008c98a9748ba7deadb80c435ddd372002b6c844 (patch) | |
| tree | 9458b87c1d28d741ee6c2384eb1028375cb703ab /OpenSim/Framework/Monitoring | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Profiles: Clean up some log entries caused when visiting HG avatar is using l... (diff) | |
| download | opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.zip opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.gz opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.bz2 opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/Monitoring')
| -rw-r--r-- | OpenSim/Framework/Monitoring/StatsLogger.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs index fa2e1b6..1e4fa11 100644 --- a/OpenSim/Framework/Monitoring/StatsLogger.cs +++ b/OpenSim/Framework/Monitoring/StatsLogger.cs | |||
| @@ -67,7 +67,7 @@ namespace OpenSim.Framework.Monitoring | |||
| 67 | if (cmd[3] == "start") | 67 | if (cmd[3] == "start") |
| 68 | { | 68 | { |
| 69 | Start(); | 69 | Start(); |
| 70 | con.OutputFormat("Now recording all stats very {0}ms to file", m_statsLogIntervalMs); | 70 | con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs); |
| 71 | } | 71 | } |
| 72 | else if (cmd[3] == "stop") | 72 | else if (cmd[3] == "stop") |
| 73 | { | 73 | { |