From 8a9a8ed5c903f3f685dfff2fd81a2c9594a12584 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 17 Dec 2011 12:31:25 +0100
Subject: Fix hit testing link sets properly. Fix raycasting for LSL.

---
 .../ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs   | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 4da8fe7..91a7b87 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -431,6 +431,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // avatar rotation. This may include a nonzero elevation if
                 // in mouselook.
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
+                if (avatar == null)
+                    return sensedEntities;
                 fromRegionPos = avatar.AbsolutePosition;
                 q = avatar.Rotation;
             }
@@ -444,6 +446,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             Action<ScenePresence> senseEntity = new Action<ScenePresence>(delegate(ScenePresence presence)
             {
+                if (presence.PresenceType == PresenceType.Npc)
+                    return;
+
                 if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0)
                     return;
                 
-- 
cgit v1.1