OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-12-18 01:54:36 +01:00
parent 42d57fbce0 ed9cb18cf0
commit 4b911348b4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -2675,9 +2675,8 @@ namespace OpenSim.Region.Physics.OdePlugin
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)
public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags)
{
if (actor != null)
{
@ -2698,7 +2697,7 @@ namespace OpenSim.Region.Physics.OdePlugin
results.CopyTo(ourResults, 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)
{
Thread.Sleep(1);