diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index dad7250..ee2bfa0 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -322,6 +322,7 @@ public sealed class BSPrim : BSPhysObject | |||
322 | }); | 322 | }); |
323 | } | 323 | } |
324 | } | 324 | } |
325 | |||
325 | public override OMV.Vector3 ForcePosition { | 326 | public override OMV.Vector3 ForcePosition { |
326 | get { | 327 | get { |
327 | _position = PhysicsScene.PE.GetPosition(PhysBody) - PositionDisplacement; | 328 | _position = PhysicsScene.PE.GetPosition(PhysBody) - PositionDisplacement; |
@@ -336,27 +337,6 @@ public sealed class BSPrim : BSPhysObject | |||
336 | } | 337 | } |
337 | } | 338 | } |
338 | } | 339 | } |
339 | /* Disable. Presume whoever is setting displacement is already adjusting position, etc. | ||
340 | // Override to have position displacement immediately update the physical position. | ||
341 | // A feeble attempt to keep the sim and physical positions in sync | ||
342 | // Must be called at taint time. | ||
343 | public override OMV.Vector3 PositionDisplacement | ||
344 | { | ||
345 | get | ||
346 | { | ||
347 | return base.PositionDisplacement; | ||
348 | } | ||
349 | set | ||
350 | { | ||
351 | base.PositionDisplacement = value; | ||
352 | PhysicsScene.TaintedObject(PhysicsScene.InTaintTime, "BSPrim.setPosition", delegate() | ||
353 | { | ||
354 | if (PhysBody.HasPhysicalBody) | ||
355 | PhysicsScene.PE.SetTranslation(PhysBody, _position + base.PositionDisplacement, _orientation); | ||
356 | }); | ||
357 | } | ||
358 | } | ||
359 | */ | ||
360 | 340 | ||
361 | // Check that the current position is sane and, if not, modify the position to make it so. | 341 | // Check that the current position is sane and, if not, modify the position to make it so. |
362 | // Check for being below terrain and being out of bounds. | 342 | // Check for being below terrain and being out of bounds. |