diff options
author | ubit | 2012-12-18 01:50:47 +0100 |
---|---|---|
committer | ubit | 2012-12-18 01:50:47 +0100 |
commit | 42d57fbce0fd8a33b5be15512827407b3b92f99a (patch) | |
tree | 74982e321203de16a0427b57a5363f71a8b5cab8 /OpenSim/Region/Physics/Manager | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | fix (diff) | |
download | opensim-SC-42d57fbce0fd8a33b5be15512827407b3b92f99a.zip opensim-SC-42d57fbce0fd8a33b5be15512827407b3b92f99a.tar.gz opensim-SC-42d57fbce0fd8a33b5be15512827407b3b92f99a.tar.bz2 opensim-SC-42d57fbce0fd8a33b5be15512827407b3b92f99a.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index a442cf0..86e0713 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -353,7 +353,7 @@ namespace OpenSim.Region.Physics.Manager | |||
353 | 353 | ||
354 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){} | 354 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){} |
355 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { } | 355 | public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { } |
356 | public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count) | 356 | public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags) |
357 | { | 357 | { |
358 | return new List<ContactResult>(); | 358 | return new List<ContactResult>(); |
359 | } | 359 | } |