diff options
| author | Melanie | 2013-01-16 01:11:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:11:20 +0000 |
| commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
| tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz | |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 939d38a..aadb583 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -328,6 +328,10 @@ public sealed class BSCharacter : BSPhysObject | |||
| 328 | public override bool Selected { | 328 | public override bool Selected { |
| 329 | set { _selected = value; } | 329 | set { _selected = value; } |
| 330 | } | 330 | } |
| 331 | public override bool IsSelected | ||
| 332 | { | ||
| 333 | get { return _selected; } | ||
| 334 | } | ||
| 331 | public override void CrossingFailure() { return; } | 335 | public override void CrossingFailure() { return; } |
| 332 | public override void link(PhysicsActor obj) { return; } | 336 | public override void link(PhysicsActor obj) { return; } |
| 333 | public override void delink() { return; } | 337 | public override void delink() { return; } |