Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 631c91b..f6295b1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2430,8 +2430,12 @@ namespace OpenSim.Region.Framework.Scenes
             float speed = Velocity.Length();
             float velocidyDiff = Vector3.Distance(lastVelocitySentToAllClients, Velocity);
 
+            // assuming 5 ms. worst case precision for timer, use 2x that 
+            // for distance error threshold
+            float distanceErrorThreshold = speed * 0.01f;
+
             if (speed < 0.01f // allow rotation updates if avatar position is unchanged
-                || Math.Abs(distanceError) > 0.25f // arbitrary distance error threshold
+                || Math.Abs(distanceError) > distanceErrorThreshold
                 || velocidyDiff > 0.01f) // did velocity change from last update?
             {
                 m_perfMonMS = currentTick;
@@ -3151,7 +3155,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 cAgent.AttachmentObjects = new List<ISceneObject>();
                 cAgent.AttachmentObjectStates = new List<string>();
-                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
+//                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
                 m_InTransitScriptStates.Clear();
                 foreach (SceneObjectGroup sog in m_attachments)
                 {