diff options
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 | ||