diff options
author | ubit | 2012-12-18 01:54:36 +0100 |
---|---|---|
committer | ubit | 2012-12-18 01:54:36 +0100 |
commit | 4b911348b47b4dd6c9e27ce9932e46e5dc0badd6 (patch) | |
tree | a1049cbd2edf097aea99dadc4427ba87e76ce71f /OpenSim/Region | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | missing file (diff) | |
download | opensim-SC-4b911348b47b4dd6c9e27ce9932e46e5dc0badd6.zip opensim-SC-4b911348b47b4dd6c9e27ce9932e46e5dc0badd6.tar.gz opensim-SC-4b911348b47b4dd6c9e27ce9932e46e5dc0badd6.tar.bz2 opensim-SC-4b911348b47b4dd6c9e27ce9932e46e5dc0badd6.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index fbf2f0d..d344d4d 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -2675,9 +2675,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2675 | m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod); | 2675 | m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod); |
2676 | } | 2676 | } |
2677 | } | 2677 | } |
2678 | 2678 | ||
2679 | // don't like this | 2679 | public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags) |
2680 | public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count) | ||
2681 | { | 2680 | { |
2682 | if (actor != null) | 2681 | if (actor != null) |
2683 | { | 2682 | { |
@@ -2698,7 +2697,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2698 | results.CopyTo(ourResults, 0); | 2697 | results.CopyTo(ourResults, 0); |
2699 | }; | 2698 | }; |
2700 | int waitTime = 0; | 2699 | int waitTime = 0; |
2701 | m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod); | 2700 | m_rayCastManager.QueueRequest(geom,position, direction, length, Count, flags, retMethod); |
2702 | while (ourResults == null && waitTime < 1000) | 2701 | while (ourResults == null && waitTime < 1000) |
2703 | { | 2702 | { |
2704 | Thread.Sleep(1); | 2703 | Thread.Sleep(1); |