diff options
| author | Diva Canto | 2014-11-21 08:54:30 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-11-21 08:54:30 -0800 |
| commit | 8d3cb424a8730a0d0cdea42e513057c2c3fff679 (patch) | |
| tree | 611eb8cd3c3526e1f41058ed000e1c3f9f644cf8 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Cleanup extraneous comments from viewer support modules (diff) | |
| parent | LSL key should be implicitly cast to a boolean value (diff) | |
| download | opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.zip opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.gz opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.bz2 opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index edec949..27ee5ac 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -1087,9 +1087,17 @@ public class BSPrim : BSPhysObject | |||
| 1087 | } | 1087 | } |
| 1088 | } | 1088 | } |
| 1089 | 1089 | ||
| 1090 | public override bool PIDActive { | 1090 | public override bool PIDActive |
| 1091 | set { | 1091 | { |
| 1092 | base.MoveToTargetActive = value; | 1092 | get |
| 1093 | { | ||
| 1094 | return MoveToTargetActive; | ||
| 1095 | } | ||
| 1096 | |||
| 1097 | set | ||
| 1098 | { | ||
| 1099 | MoveToTargetActive = value; | ||
| 1100 | |||
| 1093 | EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate() | 1101 | EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate() |
| 1094 | { | 1102 | { |
| 1095 | return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName); | 1103 | return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName); |