diff options
| author | Melanie | 2013-01-18 19:35:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-18 19:35:09 +0000 |
| commit | 9aad815177c76580e74b941b8af429335d1c259c (patch) | |
| tree | c0ea29b07d6178e5c1982fa52067787154101aa8 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.zip opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.gz opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.bz2 opensim-SC-9aad815177c76580e74b941b8af429335d1c259c.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 87a06c1..6d5e23f 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -652,6 +652,9 @@ public sealed class BSCharacter : BSPhysObject | |||
| 652 | public override bool IsStatic { | 652 | public override bool IsStatic { |
| 653 | get { return false; } | 653 | get { return false; } |
| 654 | } | 654 | } |
| 655 | public override bool IsPhysicallyActive { | ||
| 656 | get { return true; } | ||
| 657 | } | ||
| 655 | public override bool Flying { | 658 | public override bool Flying { |
| 656 | get { return _flying; } | 659 | get { return _flying; } |
| 657 | set { | 660 | set { |