diff options
| author | Diva Canto | 2012-09-15 19:35:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-15 19:35:33 -0700 |
| commit | daa4745fb785d30de256f04c763bfd6478ea2238 (patch) | |
| tree | a68b49adb21eb5902f0e3a9687878e6c6db5e014 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | More on HG2.0: added the possibility of controlling the appearance that avies... (diff) | |
| parent | BulletSim: update DLLs and SOs and remove some debugging code. (diff) | |
| download | opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.zip opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.gz opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.bz2 opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index e411fcb..3fe71e1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -41,7 +41,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 41 | { | 41 | { |
| 42 | public abstract BSLinkset Linkset { get; set; } | 42 | public abstract BSLinkset Linkset { get; set; } |
| 43 | 43 | ||
| 44 | public abstract void Collide(uint collidingWith, BSPhysObject collidee, ActorTypes type, | 44 | public abstract bool Collide(uint collidingWith, BSPhysObject collidee, |
| 45 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth); | 45 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth); |
| 46 | public abstract void SendCollisions(); | 46 | public abstract void SendCollisions(); |
| 47 | 47 | ||