From 9b7023a159c69d599248783d88ba96a328a584f2 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 12 May 2012 17:58:36 +0100
Subject:  display a sleep time of zero if forced spare time to zero, when sim
 fps is lower than desired, for better display coerence.

---
 OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 94f1b15..a4afd47 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -264,8 +264,12 @@ namespace OpenSim.Region.Framework.Scenes
                 float targetframetime = 1100.0f / (float)m_nominalReportedFps;
 
                 float sparetime;
-                if (TotalFrameTime > targetframetime )
+                float sleeptime;
+                if (TotalFrameTime > targetframetime)
+                {
                     sparetime = 0;
+                    sleeptime = 0;
+                }
                 else
                 {
                     sparetime = m_frameMS - m_physicsMS - m_agentMS;
@@ -274,6 +278,7 @@ namespace OpenSim.Region.Framework.Scenes
                         sparetime = 0;
                     else if (sparetime > TotalFrameTime)
                         sparetime = TotalFrameTime;
+                    sleeptime = m_sleeptimeMS * perframe;
                 }
                 
                 // other MS is actually simulation time
@@ -363,7 +368,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[21].StatValue = sparetime;
 
                 sb[22].StatID = (uint)Stats.SimSleepTime;
-                sb[22].StatValue = m_sleeptimeMS * perframe;
+                sb[22].StatValue = sleeptime;
                
                 for (int i = 0; i < 23; i++)
                 {
-- 
cgit v1.1