aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-xOpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs2
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs2
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 9f7c769..0cf751c 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -367,7 +367,7 @@ namespace OpenSim.Region.Framework.Scenes
367 367
368 // ORIGINAL code commented out until we have time to add our own 368 // ORIGINAL code commented out until we have time to add our own
369 // statistics to the statistics window 369 // statistics to the statistics window
370 float physfps = ((m_pfps / 1000.0f)); 370 float physfps = m_pfps;
371 371
372 //if (physfps > 600) 372 //if (physfps > 600)
373 //physfps = physfps - (physfps - 600); 373 //physfps = physfps - (physfps - 600);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8af9e88..0bace14 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -711,7 +711,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
711 // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS. 711 // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS.
712 // Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55). 712 // Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55).
713// m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate; 713// m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate;
714 m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f; 714 m_simulatedTime += (float)numSubSteps * m_fixedTimeStep;
715 } 715 }
716 716
717 // Called by a BSPhysObject to note that it has changed properties and this information 717 // Called by a BSPhysObject to note that it has changed properties and this information
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 900e67b..6cad285 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3158 } 3158 }
3159 } // end lock OdeLock 3159 } // end lock OdeLock
3160 3160
3161 return fps * (float)ODE_STEPSIZE * 1000.0f / timeStep; 3161 return fps * (float)ODE_STEPSIZE / timeStep;
3162 } // end Simulate 3162 } // end Simulate
3163 3163
3164 public override void GetResults() 3164 public override void GetResults()
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 559fcbc..0e71e7f 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -3312,7 +3312,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3312 m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick); 3312 m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick);
3313 } 3313 }
3314 3314
3315 fps *= 1000.0f/timeStep; 3315 fps *= 1.0f/timeStep;
3316 return fps; 3316 return fps;
3317 } 3317 }
3318 3318
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index e0f4c66..dd39c95 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1860,7 +1860,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1860 m_lastframe = DateTime.UtcNow; // skip also the time lost 1860 m_lastframe = DateTime.UtcNow; // skip also the time lost
1861 } 1861 }
1862 } 1862 }
1863 return (float)nodeframes * ODE_STEPSIZE / timeStep * 1000.0f; 1863 return (float)nodeframes * ODE_STEPSIZE / timeStep;
1864 } 1864 }
1865 1865
1866 /// <summary> 1866 /// <summary>