From 8271528b1fe49d99cf5b64d3644864ba4aa097c1 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Sat, 10 Oct 2009 04:01:36 -0400
Subject: * comment out the velocity test, using updates every 500 ms as set in
 ScenePresence.AddToPhysicalScene. * This causes time to be counted in
 ODECharacter and, when a collision occurs, the physics scene will report the
 collisions only if the the difference of last time it reported the collisions
 from now was more then the set ms. * This is cool because the time accrues
 while collisions are not taking place and when they do take place again, you
 get an immediate update.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 ++++--
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e20b8f2..15fb11f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3420,8 +3420,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (e == null)
                 return;
 
-            if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
-                UpdateMovementAnimations();
+            //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
+            // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
+            // as of this comment the interval is set in AddToPhysicalScene
+            UpdateMovementAnimations();
 
             if (m_invulnerable)
                 return;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 7a86b6e..bd81d50 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1318,6 +1318,9 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         internal void AddCollisionFrameTime(int p)
         {
+            // protect it from overflow crashing
+            if (m_eventsubscription + p >= int.MaxValue)
+                m_eventsubscription = 0;
             m_eventsubscription += p;
         }
     }
-- 
cgit v1.1