diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c83df4e..331cffd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2254,7 +2254,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2254 | firstname, lastname, position, notecard, | 2254 | firstname, lastname, position, notecard, |
2255 | (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, | 2255 | (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, |
2256 | false); | 2256 | false); |
2257 | // (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) == 0); | 2257 | // (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0); |
2258 | } | 2258 | } |
2259 | 2259 | ||
2260 | private LSL_Key NpcCreate( | 2260 | private LSL_Key NpcCreate( |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 5c200d6..83da204 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -31,7 +31,6 @@ using System.Collections.Generic; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using log4net; | 33 | using log4net; |
34 | |||
35 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Region.ScriptEngine.Shared; | 36 | using OpenSim.Region.ScriptEngine.Shared; |
@@ -41,6 +40,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
41 | { | 40 | { |
42 | public class SensorRepeat | 41 | public class SensorRepeat |
43 | { | 42 | { |
43 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
44 | public AsyncCommandManager m_CmdManager; | 45 | public AsyncCommandManager m_CmdManager; |
45 | 46 | ||
46 | public SensorRepeat(AsyncCommandManager CmdManager) | 47 | public SensorRepeat(AsyncCommandManager CmdManager) |
@@ -452,11 +453,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
452 | 453 | ||
453 | Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence => | 454 | Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence => |
454 | { | 455 | { |
456 | // m_log.DebugFormat( | ||
457 | // "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", | ||
458 | // presence.Name, presence.PresenceType, ts.name, ts.type); | ||
459 | |||
455 | if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc) | 460 | if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc) |
456 | { | 461 | { |
457 | INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); | 462 | INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); |
458 | if (npcData == null || !npcData.SenseAsAgent) | 463 | if (npcData == null || !npcData.SenseAsAgent) |
464 | { | ||
465 | // m_log.DebugFormat( | ||
466 | // "[SENSOR REPEAT]: Discarding NPC {0} from agent sense sweep for script item id {1}", | ||
467 | // presence.Name, ts.itemID); | ||
459 | return; | 468 | return; |
469 | } | ||
460 | } | 470 | } |
461 | 471 | ||
462 | if ((ts.type & AGENT) == 0) | 472 | if ((ts.type & AGENT) == 0) |
@@ -469,7 +479,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
469 | { | 479 | { |
470 | INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); | 480 | INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); |
471 | if (npcData != null && npcData.SenseAsAgent) | 481 | if (npcData != null && npcData.SenseAsAgent) |
482 | { | ||
483 | // m_log.DebugFormat( | ||
484 | // "[SENSOR REPEAT]: Discarding NPC {0} from non-agent sense sweep for script item id {1}", | ||
485 | // presence.Name, ts.itemID); | ||
472 | return; | 486 | return; |
487 | } | ||
473 | } | 488 | } |
474 | } | 489 | } |
475 | 490 | ||