aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-12-18 00:54:40 +0000
committerUbitUmarov2012-12-18 00:54:40 +0000
commited9cb18cf0cb5b76946d7afb79e3c8677110c41b (patch)
treec7a7e71fa7fe87c6c4ac3e280bf4c3dc49a052fb /OpenSim
parentfix (diff)
downloadopensim-SC_OLD-ed9cb18cf0cb5b76946d7afb79e3c8677110c41b.zip
opensim-SC_OLD-ed9cb18cf0cb5b76946d7afb79e3c8677110c41b.tar.gz
opensim-SC_OLD-ed9cb18cf0cb5b76946d7afb79e3c8677110c41b.tar.bz2
opensim-SC_OLD-ed9cb18cf0cb5b76946d7afb79e3c8677110c41b.tar.xz
missing file
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs7
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);