From 982328b4ed2f632765e3c3d3bd1cc1110fdb91fa Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 7 Jan 2013 10:56:30 +0000
Subject: exclude avatars from unfiltered RaycastWorld

---
 OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')

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
                 req.Normal = direction;
                 req.Origin = position;
                 req.Count = 0;
-                req.filter = RayFilterFlags.All;
+                req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
 
                 m_rayCastManager.QueueRequest(req);
             }
@@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 req.Normal = direction;
                 req.Origin = position;
                 req.Count = Count;
-                req.filter = RayFilterFlags.All;
+                req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
 
                 m_rayCastManager.QueueRequest(req);
             }
@@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             req.Normal = direction;
             req.Origin = position;
             req.Count = Count;
-            req.filter = RayFilterFlags.All;
+            req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
 
             lock (SyncObject)
             {
-- 
cgit v1.1


From d2cb2da7909aa79260af52a7abbc7b491c5495c2 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 7 Jan 2013 11:03:36 +0000
Subject:  also exclude land

---
 OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index f58870a..0d18adb 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 req.Normal = direction;
                 req.Origin = position;
                 req.Count = 0;
-                req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
+                req.filter = RayFilterFlags.AllPrims;
 
                 m_rayCastManager.QueueRequest(req);
             }
@@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 req.Normal = direction;
                 req.Origin = position;
                 req.Count = Count;
-                req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
+                req.filter = RayFilterFlags.AllPrims;
 
                 m_rayCastManager.QueueRequest(req);
             }
@@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             req.Normal = direction;
             req.Origin = position;
             req.Count = Count;
-            req.filter = RayFilterFlags.AllPrims | RayFilterFlags.land;
+            req.filter = RayFilterFlags.AllPrims;
 
             lock (SyncObject)
             {
-- 
cgit v1.1