diff options
| author | Melanie | 2009-12-06 03:01:58 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-06 03:01:58 +0000 |
| commit | 09bbfc1d56a669462faaf1d35e2758bb66a50bdb (patch) | |
| tree | 13039ed957fc83ef1b2752ec37f3e5d4383fbc86 /OpenSim/Region/Physics/Manager | |
| parent | Experimental: Remove explicit property sends (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-09bbfc1d56a669462faaf1d35e2758bb66a50bdb.zip opensim-SC-09bbfc1d56a669462faaf1d35e2758bb66a50bdb.tar.gz opensim-SC-09bbfc1d56a669462faaf1d35e2758bb66a50bdb.tar.bz2 opensim-SC-09bbfc1d56a669462faaf1d35e2758bb66a50bdb.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 6d515e9..217d307 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 36 | { | 36 | { |
| 37 | public delegate void physicsCrash(); | 37 | public delegate void physicsCrash(); |
| 38 | 38 | ||
| 39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance); | 39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal); |
| 40 | 40 | ||
| 41 | public abstract class PhysicsScene | 41 | public abstract class PhysicsScene |
| 42 | { | 42 | { |
| @@ -204,7 +204,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 204 | public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod) | 204 | public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod) |
| 205 | { | 205 | { |
| 206 | if (retMethod != null) | 206 | if (retMethod != null) |
| 207 | retMethod(false, Vector3.Zero, 0, 999999999999f); | 207 | retMethod(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero); |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | private class NullPhysicsScene : PhysicsScene | 210 | private class NullPhysicsScene : PhysicsScene |