From 3a93bb992fade04a463d6cd91bc014b110e217a5 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 7 Mar 2009 00:27:56 +0000
Subject: * Added some limits to the maximum force applied per second by
 llMoveToTarget.  Currently, it's 350 times the mass in newtons applied per
 second, maximum.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index b94f374..0a6faa8 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -482,6 +482,12 @@ namespace OpenSim.Region.Physics.OdePlugin
             d.WorldSetGravity(world, gravityx, gravityy, gravityz);
             d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
 
+            d.WorldSetLinearDamping(world, 256f);
+            d.WorldSetAngularDamping(world, 256f);
+            d.WorldSetAngularDampingThreshold(world, 256f);
+            d.WorldSetLinearDampingThreshold(world, 256f);
+            d.WorldSetMaxAngularSpeed(world, 256f);
+
             // Set how many steps we go without running collision testing
             // This is in addition to the step size.
             // Essentially Steps * m_physicsiterations
@@ -2296,9 +2302,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 // Figure out the Frames Per Second we're going at.
                 //(step_time == 0.004f, there's 250 of those per second.   Times the step time/step size
-                step_time = 0.09375f;
+                
                 fps = (step_time/ODE_STEPSIZE) * 1000;
 
+                step_time = 0.09375f;
+
                 while (step_time > 0.0f)
                 {
                     //lock (ode)
-- 
cgit v1.1