diff options
| author | Robert Adams | 2013-05-03 15:46:35 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-06 13:32:22 -0700 |
| commit | f9fb1484aa00f8bfadead06ce71d004502fb564e (patch) | |
| tree | a8af22458ad7f191a9736ce0531fbf30c5d4987b /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Added new method to Remote Admin for reloading the estate settings. This is m... (diff) | |
| download | opensim-SC-f9fb1484aa00f8bfadead06ce71d004502fb564e.zip opensim-SC-f9fb1484aa00f8bfadead06ce71d004502fb564e.tar.gz opensim-SC-f9fb1484aa00f8bfadead06ce71d004502fb564e.tar.bz2 opensim-SC-f9fb1484aa00f8bfadead06ce71d004502fb564e.tar.xz | |
BulletSim: extend BSActorLockAxis to allow locking linear movement in
addition to angular movement. Not enabled by anything yet.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index d3f3475..f5b0361 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -256,9 +256,9 @@ public class BSPrim : BSPhysObject | |||
| 256 | if (axis.X != 1) locking.X = 0f; | 256 | if (axis.X != 1) locking.X = 0f; |
| 257 | if (axis.Y != 1) locking.Y = 0f; | 257 | if (axis.Y != 1) locking.Y = 0f; |
| 258 | if (axis.Z != 1) locking.Z = 0f; | 258 | if (axis.Z != 1) locking.Z = 0f; |
| 259 | LockedAxis = locking; | 259 | LockedAngularAxis = locking; |
| 260 | 260 | ||
| 261 | EnableActor(LockedAxis != LockedAxisFree, LockedAxisActorName, delegate() | 261 | EnableActor(LockedAngularAxis != LockedAxisFree, LockedAxisActorName, delegate() |
| 262 | { | 262 | { |
| 263 | return new BSActorLockAxis(PhysScene, this, LockedAxisActorName); | 263 | return new BSActorLockAxis(PhysScene, this, LockedAxisActorName); |
| 264 | }); | 264 | }); |