diff options
| author | Oren Hurvitz | 2015-07-24 13:05:57 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2015-08-11 07:35:40 +0100 |
| commit | 20af31f18e7a56a3c094c7932bb9f54ce13e49df (patch) | |
| tree | d60729b96d466c459262dd5be8f2f46928ea637f /OpenSim | |
| parent | Log scripts that have processed many events: this is probably an indication o... (diff) | |
| download | opensim-SC_OLD-20af31f18e7a56a3c094c7932bb9f54ce13e49df.zip opensim-SC_OLD-20af31f18e7a56a3c094c7932bb9f54ce13e49df.tar.gz opensim-SC_OLD-20af31f18e7a56a3c094c7932bb9f54ce13e49df.tar.bz2 opensim-SC_OLD-20af31f18e7a56a3c094c7932bb9f54ce13e49df.tar.xz | |
Fixed mistakes related to confusion between Environment.TickCount (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds)
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index ad83b42..76be91a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -180,9 +180,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 180 | scene.Name, | 180 | scene.Name, |
| 181 | StatType.Pull, | 181 | StatType.Pull, |
| 182 | MeasuresOfInterest.None, | 182 | MeasuresOfInterest.None, |
| 183 | stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, | 183 | stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod, |
| 184 | // stat => | 184 | // stat => |
| 185 | // stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, 7), | 185 | // stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod, 7), |
| 186 | StatVerbosity.Debug)); | 186 | StatVerbosity.Debug)); |
| 187 | } | 187 | } |
| 188 | 188 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 0055322..bae66e8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -202,7 +202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 202 | 202 | ||
| 203 | public long MeasurementPeriodExecutionTime { get; private set; } | 203 | public long MeasurementPeriodExecutionTime { get; private set; } |
| 204 | 204 | ||
| 205 | public static readonly long MaxMeasurementPeriod = 30 * TimeSpan.TicksPerMinute; | 205 | public static readonly long MaxMeasurementPeriod = 30 * (TimeSpan.TicksPerMinute / TimeSpan.TicksPerMillisecond); |
| 206 | 206 | ||
| 207 | private bool m_coopTermination; | 207 | private bool m_coopTermination; |
| 208 | 208 | ||