aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-07-25 01:28:11 +0100
committerMelanie2012-07-25 01:28:11 +0100
commitaf05aaaf36c402cd774acd62893113681596474c (patch)
tree27fb698a2096c7db65d12351e48d642379299689 /OpenSim/Region/ScriptEngine
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC_OLD-af05aaaf36c402cd774acd62893113681596474c.zip
opensim-SC_OLD-af05aaaf36c402cd774acd62893113681596474c.tar.gz
opensim-SC_OLD-af05aaaf36c402cd774acd62893113681596474c.tar.bz2
opensim-SC_OLD-af05aaaf36c402cd774acd62893113681596474c.tar.xz
Remove support for the OS_NPC constant. That one seems to be overly paranoid
to have and confuses the issue.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index f7314da..19f3ce1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
68 private const int AGENT = 1; 68 private const int AGENT = 1;
69 private const int AGENT_BY_USERNAME = 0x10; 69 private const int AGENT_BY_USERNAME = 0x10;
70 private const int NPC = 0x20; 70 private const int NPC = 0x20;
71 private const int OS_NPC = 0x01000000;
72 private const int ACTIVE = 2; 71 private const int ACTIVE = 2;
73 private const int PASSIVE = 4; 72 private const int PASSIVE = 4;
74 private const int SCRIPTED = 8; 73 private const int SCRIPTED = 8;
@@ -221,7 +220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
221 List<SensedEntity> sensedEntities = new List<SensedEntity>(); 220 List<SensedEntity> sensedEntities = new List<SensedEntity>();
222 221
223 // Is the sensor type is AGENT and not SCRIPTED then include agents 222 // Is the sensor type is AGENT and not SCRIPTED then include agents
224 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC | OS_NPC)) != 0 && (ts.type & SCRIPTED) == 0) 223 if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
225 { 224 {
226 sensedEntities.AddRange(doAgentSensor(ts)); 225 sensedEntities.AddRange(doAgentSensor(ts));
227 } 226 }
@@ -485,7 +484,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
485// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}", 484// "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}",
486// presence.Name, presence.PresenceType, ts.name, ts.type); 485// presence.Name, presence.PresenceType, ts.name, ts.type);
487 486
488 if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc) 487 if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
489 { 488 {
490 INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene); 489 INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene);
491 if (npcData == null || !npcData.SenseAsAgent) 490 if (npcData == null || !npcData.SenseAsAgent)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 5669917..a08cc42 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
56 public const int ACTIVE = 2; 56 public const int ACTIVE = 2;
57 public const int PASSIVE = 4; 57 public const int PASSIVE = 4;
58 public const int SCRIPTED = 8; 58 public const int SCRIPTED = 8;
59 public const int OS_NPC = 0x01000000;
60 59
61 public const int CONTROL_FWD = 1; 60 public const int CONTROL_FWD = 1;
62 public const int CONTROL_BACK = 2; 61 public const int CONTROL_BACK = 2;