aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 00baa21..900e67b 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -1669,11 +1669,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1669 1669
1670 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) 1670 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
1671 { 1671 {
1672 return AddAvatar(avName, position, size, isFlying);
1673 }
1674
1675 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
1676 {
1677 Vector3 pos; 1672 Vector3 pos;
1678 pos.X = position.X; 1673 pos.X = position.X;
1679 pos.Y = position.Y; 1674 pos.Y = position.Y;
@@ -3163,7 +3158,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3163 } 3158 }
3164 } // end lock OdeLock 3159 } // end lock OdeLock
3165 3160
3166 return fps * 1000.0f; //NB This is a FRAME COUNT, not a time! AND is divide by 1000 in SimStatusReporter! 3161 return fps * (float)ODE_STEPSIZE * 1000.0f / timeStep;
3167 } // end Simulate 3162 } // end Simulate
3168 3163
3169 public override void GetResults() 3164 public override void GetResults()