* One more tweak to inform the user that they may not be able to move until relogging.

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b468dde..c25fa55 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3419,10 +3419,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void OutOfBoundsCall(PhysicsVector pos)
         {
-            bool flying = m_physicsActor.Flying;
-            RemoveFromPhysicalScene();
+            //bool flying = m_physicsActor.Flying;
+            //RemoveFromPhysicalScene();
 
-            AddToPhysicalScene(flying);
+            //AddToPhysicalScene(flying);
+            if (ControllingClient != null)
+                ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar.  You may not be able to move until you relog.",true);
         }
 
         // Event called by the physics plugin to tell the avatar about a collision.
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 8002eb2..1fff846 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 _parent_scene.BadCharacter(this);
                 vec = new d.Vector3(_position.X, _position.Y, _position.Z);
-                //base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
+                base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
                 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name);
             }