Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization

1 files changed, 14 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a5b88c6..973537e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -902,6 +902,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (PhysicsActor != null)
             {
                 m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
+                m_physicsActor.OnOutOfBounds -= OutOfBoundsCall;
                 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
                 m_physicsActor.UnSubscribeEvents();
                 m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
@@ -2500,8 +2501,9 @@ namespace OpenSim.Region.Framework.Scenes
             List<ScenePresence> avatars = m_scene.GetAvatars();
             for (int i = 0; i < avatars.Count; i++)
             {
-                if (avatars[i] != this)
-                {
+                // Requested by LibOMV.   Send Course Location on self.
+                //if (avatars[i] != this)
+                //{
                     if (avatars[i].ParentID != 0)
                     {
                         // sitting avatar
@@ -2523,7 +2525,7 @@ namespace OpenSim.Region.Framework.Scenes
                         CoarseLocations.Add(avatars[i].m_pos);
                         AvatarUUIDs.Add(avatars[i].UUID);
                     }
-                }
+                //}
             }
 
             m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
@@ -3402,11 +3404,20 @@ namespace OpenSim.Region.Framework.Scenes
             scene.AddPhysicsActorTaint(m_physicsActor);
             //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
             m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
+            m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
             m_physicsActor.SubscribeEvents(500);
             m_physicsActor.LocalID = LocalId;
             
         }
 
+        private void OutOfBoundsCall(PhysicsVector pos)
+        {
+            bool flying = m_physicsActor.Flying;
+            RemoveFromPhysicalScene();
+
+            AddToPhysicalScene(flying);
+        }
+
         // Event called by the physics plugin to tell the avatar about a collision.
         private void PhysicsCollisionUpdate(EventArgs e)
         {