missing file

avinationmerge
UbitUmarov 2012-12-18 00:54:40 +00:00
parent f87af983f3
commit ed9cb18cf0
1 changed files with 3 additions and 4 deletions

View File

@ -2675,9 +2675,8 @@ namespace OpenSim.Region.Physics.OdePlugin
m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod); m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod);
} }
} }
// don't like this public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags)
public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count)
{ {
if (actor != null) if (actor != null)
{ {
@ -2698,7 +2697,7 @@ namespace OpenSim.Region.Physics.OdePlugin
results.CopyTo(ourResults, 0); results.CopyTo(ourResults, 0);
}; };
int waitTime = 0; int waitTime = 0;
m_rayCastManager.QueueRequest(geom,position, direction, length, Count, retMethod); m_rayCastManager.QueueRequest(geom,position, direction, length, Count, flags, retMethod);
while (ourResults == null && waitTime < 1000) while (ourResults == null && waitTime < 1000)
{ {
Thread.Sleep(1); Thread.Sleep(1);