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

avinationmerge
ubit 2013-01-07 12:04:50 +01:00
commit 42acd2d721
1 changed files with 3 additions and 3 deletions

View File

@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction; req.Normal = direction;
req.Origin = position; req.Origin = position;
req.Count = 0; req.Count = 0;
req.filter = RayFilterFlags.All; req.filter = RayFilterFlags.AllPrims;
m_rayCastManager.QueueRequest(req); m_rayCastManager.QueueRequest(req);
} }
@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction; req.Normal = direction;
req.Origin = position; req.Origin = position;
req.Count = Count; req.Count = Count;
req.filter = RayFilterFlags.All; req.filter = RayFilterFlags.AllPrims;
m_rayCastManager.QueueRequest(req); m_rayCastManager.QueueRequest(req);
} }
@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction; req.Normal = direction;
req.Origin = position; req.Origin = position;
req.Count = Count; req.Count = Count;
req.filter = RayFilterFlags.All; req.filter = RayFilterFlags.AllPrims;
lock (SyncObject) lock (SyncObject)
{ {