From f1846045a6663c0530524d7c91d1ed17bf449c07 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 6 Jan 2012 21:34:43 +0100
Subject: Add osNpcCreateOwned to create an owned NPC. Those can be sensed only
 by the owner, can be destroyed only by the owner and only the owner can save
 their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude
 them from "AGENT" results.

---
 .../Shared/Api/Implementation/Plugins/SensorRepeat.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(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 91a7b87..ac1c1a9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -26,10 +26,13 @@
  */
 
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
+using log4net;
 
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api;
@@ -51,6 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         private const int AGENT = 1;
         private const int AGENT_BY_USERNAME = 0x10;
+        private const int NPC = 0x20;
         private const int ACTIVE = 2;
         private const int PASSIVE = 4;
         private const int SCRIPTED = 8;
@@ -203,7 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             List<SensedEntity> sensedEntities = new List<SensedEntity>();
 
             // Is the sensor type is AGENT and not SCRIPTED then include agents
-            if ((ts.type & (AGENT | AGENT_BY_USERNAME)) != 0 && (ts.type & SCRIPTED) == 0)
+            if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
             {
                 sensedEntities.AddRange(doAgentSensor(ts));
             }
@@ -415,6 +419,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
         private List<SensedEntity> doAgentSensor(SenseRepeatClass ts)
         {
+            INPCModule npcModule = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<INPCModule>();
+
             List<SensedEntity> sensedEntities = new List<SensedEntity>();
 
             // If nobody about quit fast
@@ -446,7 +452,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             Action<ScenePresence> senseEntity = new Action<ScenePresence>(delegate(ScenePresence presence)
             {
-                if (presence.PresenceType == PresenceType.Npc)
+                if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
+                    return;
+                if ((ts.type & AGENT) == 0 && presence.PresenceType == PresenceType.User)
                     return;
 
                 if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0)
@@ -460,6 +468,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 toRegionPos = presence.AbsolutePosition;
                 dis = Math.Abs(Util.GetDistanceTo(toRegionPos, fromRegionPos));
 
+                if (presence.PresenceType == PresenceType.Npc && npcModule != null)
+                {
+                    UUID npcOwner = npcModule.GetOwner(presence.UUID);
+                    if (npcOwner != UUID.Zero && npcOwner != SensePoint.OwnerID)
+                        return;
+                }
+
                 // are they in range
                 if (dis <= ts.range)
                 {
-- 
cgit v1.1