aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2013-01-07 10:56:30 +0000
committerUbitUmarov2013-01-07 10:56:30 +0000
commit982328b4ed2f632765e3c3d3bd1cc1110fdb91fa (patch)
treebfd865ae170982dcff51b76edcf94ba98698c95e
parent in raycast for camera exclude self detection (diff)
downloadopensim-SC_OLD-982328b4ed2f632765e3c3d3bd1cc1110fdb91fa.zip
opensim-SC_OLD-982328b4ed2f632765e3c3d3bd1cc1110fdb91fa.tar.gz
opensim-SC_OLD-982328b4ed2f632765e3c3d3bd1cc1110fdb91fa.tar.bz2
opensim-SC_OLD-982328b4ed2f632765e3c3d3bd1cc1110fdb91fa.tar.xz
exclude avatars from unfiltered RaycastWorld
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index d045b59..f58870a 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2586 req.Normal = direction; 2586 req.Normal = direction;
2587 req.Origin = position; 2587 req.Origin = position;
2588 req.Count = 0; 2588 req.Count = 0;
2589 req.filter = RayFilterFlags.All; 2589 req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
2590 2590
2591 m_rayCastManager.QueueRequest(req); 2591 m_rayCastManager.QueueRequest(req);
2592 } 2592 }
@@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2603 req.Normal = direction; 2603 req.Normal = direction;
2604 req.Origin = position; 2604 req.Origin = position;
2605 req.Count = Count; 2605 req.Count = Count;
2606 req.filter = RayFilterFlags.All; 2606 req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
2607 2607
2608 m_rayCastManager.QueueRequest(req); 2608 m_rayCastManager.QueueRequest(req);
2609 } 2609 }
@@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2631 req.Normal = direction; 2631 req.Normal = direction;
2632 req.Origin = position; 2632 req.Origin = position;
2633 req.Count = Count; 2633 req.Count = Count;
2634 req.filter = RayFilterFlags.All; 2634 req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
2635 2635
2636 lock (SyncObject) 2636 lock (SyncObject)
2637 { 2637 {