BulletSim: add OutOfBounds logic and some position sanity checking

to eliminate some of the "cannot find terrain height" warning messages.

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 8dca7c6..1f186c3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -443,6 +443,7 @@ public sealed class BSCharacter : BSPhysObject
             PhysicsScene.TaintedObject("BSCharacter.setPosition", delegate()
             {
                 DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
+                PositionSanityCheck();
                 ForcePosition = _position;
             });
         }
@@ -456,7 +457,6 @@ public sealed class BSCharacter : BSPhysObject
             _position = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PositionSanityCheck();
                 PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
             }
         }
@@ -512,9 +512,8 @@ public sealed class BSCharacter : BSPhysObject
             //    just assign to "Position" because of potential call loops.
             PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
             {
-                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
-                if (PhysBody.HasPhysicalBody)
-                    PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);

+                ForcePosition = _position;
             });
             ret = true;
         }