1 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 32a98b4..a9a4cda 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1391,10 +1391,11 @@ namespace OpenSim.Region.Framework.Scenes
             int previousFrameTick;
             int maintc;
             int sleepMS;
+            int framestart;
 
             while (!m_shuttingDown && (endFrame == null || Frame < endFrame))
             {
-                maintc = Util.EnvironmentTickCount();
+                framestart = Util.EnvironmentTickCount();
                 ++Frame;
 
 //            m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
@@ -1481,7 +1482,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //    landMS = Util.EnvironmentTickCountSubtract(ldMS);
                     //}
 
-                    frameMS = Util.EnvironmentTickCountSubtract(maintc);
+                    //                    frameMS = Util.EnvironmentTickCountSubtract(maintc);
                     otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
 
                     // if (Frame%m_update_avatars == 0)
@@ -1496,7 +1497,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // frameMS currently records work frame times, not total frame times (work + any required sleep to
                     // reach min frame time.
-                    StatsReporter.addFrameMS(frameMS);
+                    //                    StatsReporter.addFrameMS(frameMS);
 
                     StatsReporter.addAgentMS(agentMS);
                     StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
@@ -1553,17 +1554,21 @@ namespace OpenSim.Region.Framework.Scenes
 
                 previousFrameTick = m_lastFrameTick;
                 m_lastFrameTick = Util.EnvironmentTickCount();
-                maintc = Util.EnvironmentTickCountSubtract(m_lastFrameTick, maintc);
+                maintc = Util.EnvironmentTickCountSubtract(m_lastFrameTick, framestart);
                 maintc = (int)(MinFrameTime * 1000) - maintc;
 
                 m_firstHeartbeat = false;
 
+
                 sleepMS = Util.EnvironmentTickCount();
+
                 if (maintc > 0)
                     Thread.Sleep(maintc);
 
                 sleepMS = Util.EnvironmentTickCountSubtract(sleepMS);
+                frameMS = Util.EnvironmentTickCountSubtract(framestart);
                 StatsReporter.addSleepMS(sleepMS);
+                StatsReporter.addFrameMS(frameMS);
                 
                 // Optionally warn if a frame takes double the amount of time that it should.
                 if (DebugUpdates