Merge branch 'master' into vehicles

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 42051d0..7c3875d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -282,9 +282,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         private UpdatePrioritizationSchemes m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time;
         private bool m_reprioritization_enabled = true;
-        private double m_reprioritization_interval = 2000.0;
-        private double m_root_reprioritization_distance = 5.0;
-        private double m_child_reprioritization_distance = 10.0;
+        private double m_reprioritization_interval = 5000.0;
+        private double m_root_reprioritization_distance = 10.0;
+        private double m_child_reprioritization_distance = 20.0;
 
         private object m_deleting_scene_object = new object();
 
@@ -4264,6 +4264,8 @@ namespace OpenSim.Region.Framework.Scenes
             // FIXME: Asynchronous iteration is disabled until we have a threading model that
             // can support calling this function from an async packet handler without
             // potentially deadlocking
+            m_clientManager.ForEachSync(action);
+
             //if (doAsynchronous)
             //    m_clientManager.ForEach(action);
             //else
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 70f3112..9b11582 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2394,7 +2394,7 @@ if (m_shape != null) {
         public void SendScheduledUpdates()
         {
             const float VELOCITY_TOLERANCE = 0.01f;
-            const float POSITION_TOLERANCE = 10.0f;
+            const float POSITION_TOLERANCE = 0.1f;
 
             if (m_updateFlag == 1)
             {