diff options
| author | Melanie | 2009-12-06 02:54:47 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-06 02:54:47 +0000 |
| commit | a44749b9d2d6b5295b4d642cae120c657e909f77 (patch) | |
| tree | 5766467acf201af97884e934e33cea103d74c526 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
| parent | Experimental: Remove explicit property sends (diff) | |
| parent | * Adds Normal to the fields returned by the Physics Raycaster (diff) | |
| download | opensim-SC-a44749b9d2d6b5295b4d642cae120c657e909f77.zip opensim-SC-a44749b9d2d6b5295b4d642cae120c657e909f77.tar.gz opensim-SC-a44749b9d2d6b5295b4d642cae120c657e909f77.tar.bz2 opensim-SC-a44749b9d2d6b5295b4d642cae120c657e909f77.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
| -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 |