From 20af31f18e7a56a3c094c7932bb9f54ce13e49df Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Fri, 24 Jul 2015 13:05:57 +0300 Subject: [PATCH] Fixed mistakes related to confusion between Environment.TickCount (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds) --- OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 4 ++-- 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 ad83b4265b..76be91a40b 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 scene.Name, StatType.Pull, MeasuresOfInterest.None, - stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, + stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod, // stat => -// stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, 7), +// stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod, 7), StatVerbosity.Debug)); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 0055322a47..bae66e8c37 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 public long MeasurementPeriodExecutionTime { get; private set; } - public static readonly long MaxMeasurementPeriod = 30 * TimeSpan.TicksPerMinute; + public static readonly long MaxMeasurementPeriod = 30 * (TimeSpan.TicksPerMinute / TimeSpan.TicksPerMillisecond); private bool m_coopTermination;