remove a forgotten 1000.9 factor on physics fps

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
 
                // ORIGINAL code commented out until we have time to add our own
                // statistics to the statistics window
-                float physfps = ((m_pfps / 1000.0f));
+                float physfps = m_pfps;
                
                 //if (physfps > 600)
                 //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
         // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS.
         // Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55).
 //        m_simulatedTime +=  (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate;
-        m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f;
+        m_simulatedTime += (float)numSubSteps * m_fixedTimeStep;
     }
 
     // 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
                 }
             } // end lock OdeLock
             
-            return fps * (float)ODE_STEPSIZE * 1000.0f / timeStep;
+            return fps * (float)ODE_STEPSIZE / timeStep;
         } // end Simulate
 
         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
                     m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick);
             }
 
-            fps *= 1000.0f/timeStep;
+            fps *= 1.0f/timeStep;
             return fps;
         }
 
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
                     m_lastframe = DateTime.UtcNow; // skip also the time lost
                 }
             }
-            return (float)nodeframes * ODE_STEPSIZE / timeStep * 1000.0f;
+            return (float)nodeframes * ODE_STEPSIZE / timeStep;
         }
 
         /// <summary>