diff options
| author | Justin Clark-Casey (justincc) | 2013-08-12 22:57:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-12 22:57:32 +0100 |
| commit | 4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1 (patch) | |
| tree | f9e4bb133ee97106561ecffb9f74c384183bd525 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Make show bots pCampbot console command print connected, connecting, etc. bot... (diff) | |
| parent | BulletSim: add check in avatar stair step code to verify the collision (diff) | |
| download | opensim-SC-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.zip opensim-SC-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.gz opensim-SC-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.bz2 opensim-SC-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index a0b6abc..6b5dea3 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -617,6 +617,10 @@ public class BSPrim : BSPhysObject | |||
| 617 | } | 617 | } |
| 618 | return; | 618 | return; |
| 619 | } | 619 | } |
| 620 | public override bool IsVolumeDetect | ||
| 621 | { | ||
| 622 | get { return _isVolumeDetect; } | ||
| 623 | } | ||
| 620 | public override void SetMaterial(int material) | 624 | public override void SetMaterial(int material) |
| 621 | { | 625 | { |
| 622 | base.SetMaterial(material); | 626 | base.SetMaterial(material); |