diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 31900ec..905bde2 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1653,7 +1653,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1653 | 1653 | ||
1654 | // These variables will be used to save the precise frame time using the | 1654 | // These variables will be used to save the precise frame time using the |
1655 | // Stopwatch class of Microsoft SDK; the times are recorded at the start | 1655 | // Stopwatch class of Microsoft SDK; the times are recorded at the start |
1656 | // and end of a parcticular section of code, and then used to calculate | 1656 | // and end of a particular section of code, and then used to calculate |
1657 | // the frame times, which are the sums of the sections for each given name | 1657 | // the frame times, which are the sums of the sections for each given name |
1658 | double preciseTotalFrameTime = 0.0; | 1658 | double preciseTotalFrameTime = 0.0; |
1659 | double preciseSimFrameTime = 0.0; | 1659 | double preciseSimFrameTime = 0.0; |
@@ -1698,7 +1698,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1698 | // input took | 1698 | // input took |
1699 | simFrameStopwatch.Stop(); | 1699 | simFrameStopwatch.Stop(); |
1700 | preciseSimFrameTime = | 1700 | preciseSimFrameTime = |
1701 | simFrameStopwatch.Elapsed.TotalMilliseconds; | 1701 | simFrameStopwatch.Elapsed.TotalMilliseconds; |
1702 | terrainMS = Util.EnvironmentTickCountSubtract(tmpMS); | 1702 | terrainMS = Util.EnvironmentTickCountSubtract(tmpMS); |
1703 | } | 1703 | } |
1704 | 1704 | ||
@@ -1717,7 +1717,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1717 | // Begin the stopwatch to track the time to prepare physics | 1717 | // Begin the stopwatch to track the time to prepare physics |
1718 | physicsFrameStopwatch.Start(); | 1718 | physicsFrameStopwatch.Start(); |
1719 | if (PhysicsEnabled && Frame % m_update_physics == 0) | 1719 | if (PhysicsEnabled && Frame % m_update_physics == 0) |
1720 | m_sceneGraph.UpdatePreparePhysics(); | 1720 | m_sceneGraph.UpdatePreparePhysics(); |
1721 | 1721 | ||
1722 | // Get the time it took to prepare the physics, this | 1722 | // Get the time it took to prepare the physics, this |
1723 | // would report the most precise time that physics was | 1723 | // would report the most precise time that physics was |
@@ -1738,7 +1738,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1738 | // took | 1738 | // took |
1739 | simFrameStopwatch.Stop(); | 1739 | simFrameStopwatch.Stop(); |
1740 | preciseSimFrameTime += | 1740 | preciseSimFrameTime += |
1741 | simFrameStopwatch.Elapsed.TotalMilliseconds; | 1741 | simFrameStopwatch.Elapsed.TotalMilliseconds; |
1742 | agentMS = Util.EnvironmentTickCountSubtract(tmpMS); | 1742 | agentMS = Util.EnvironmentTickCountSubtract(tmpMS); |
1743 | 1743 | ||
1744 | // Perform the main physics update. This will do the actual work of moving objects and avatars according to their | 1744 | // Perform the main physics update. This will do the actual work of moving objects and avatars according to their |
@@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1851 | // Get the elapsed time for the simulation frame | 1851 | // Get the elapsed time for the simulation frame |
1852 | simFrameStopwatch.Stop(); | 1852 | simFrameStopwatch.Stop(); |
1853 | preciseSimFrameTime += | 1853 | preciseSimFrameTime += |
1854 | simFrameStopwatch.Elapsed.TotalMilliseconds; | 1854 | simFrameStopwatch.Elapsed.TotalMilliseconds; |
1855 | 1855 | ||
1856 | if (!UpdateOnTimer) | 1856 | if (!UpdateOnTimer) |
1857 | { | 1857 | { |
@@ -1872,7 +1872,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1872 | // Get the total frame time | 1872 | // Get the total frame time |
1873 | totalFrameStopwatch.Stop(); | 1873 | totalFrameStopwatch.Stop(); |
1874 | preciseTotalFrameTime = | 1874 | preciseTotalFrameTime = |
1875 | totalFrameStopwatch.Elapsed.TotalMilliseconds; | 1875 | totalFrameStopwatch.Elapsed.TotalMilliseconds; |
1876 | 1876 | ||
1877 | // Restart the stopwatch for the total time of the next frame | 1877 | // Restart the stopwatch for the total time of the next frame |
1878 | totalFrameStopwatch.Restart(); | 1878 | totalFrameStopwatch.Restart(); |
@@ -1897,7 +1897,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1897 | // Send the correct time values to the stats reporter for the | 1897 | // Send the correct time values to the stats reporter for the |
1898 | // frame times | 1898 | // frame times |
1899 | StatsReporter.addFrameTimeMilliseconds(preciseTotalFrameTime, | 1899 | StatsReporter.addFrameTimeMilliseconds(preciseTotalFrameTime, |
1900 | preciseSimFrameTime, precisePhysicsFrameTime, 0.0); | 1900 | preciseSimFrameTime, precisePhysicsFrameTime, 0.0); |
1901 | 1901 | ||
1902 | // Send the correct number of frames that the physics library | 1902 | // Send the correct number of frames that the physics library |
1903 | // has processed to the stats reporter | 1903 | // has processed to the stats reporter |