diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index bff85af..84e8313 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -36,7 +36,6 @@ using OpenSim.Region.Environment.Interfaces; | |||
36 | using OpenSim.Region.Environment.Modules; | 36 | using OpenSim.Region.Environment.Modules; |
37 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; | ||
40 | 39 | ||
41 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 40 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
42 | { | 41 | { |
@@ -49,7 +48,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
49 | m_CmdManager = CmdManager; | 48 | m_CmdManager = CmdManager; |
50 | } | 49 | } |
51 | 50 | ||
52 | |||
53 | public Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>> SenseEvents = | 51 | public Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>> SenseEvents = |
54 | new Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>>(); | 52 | new Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>>(); |
55 | private Object SenseLock = new Object(); | 53 | private Object SenseLock = new Object(); |
@@ -183,7 +181,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
183 | return SenseList; | 181 | return SenseList; |
184 | } | 182 | } |
185 | } | 183 | } |
186 | |||
187 | } | 184 | } |
188 | 185 | ||
189 | private void SensorSweep(SenseRepeatClass ts) | 186 | private void SensorSweep(SenseRepeatClass ts) |
@@ -261,7 +258,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
261 | if (ang_obj > ts.arc) keep = false; | 258 | if (ang_obj > ts.arc) keep = false; |
262 | } | 259 | } |
263 | 260 | ||
264 | |||
265 | if (keep && (ts.keyID != null) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) | 261 | if (keep && (ts.keyID != null) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) |
266 | { | 262 | { |
267 | keep = false; | 263 | keep = false; |
@@ -286,13 +282,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
286 | objectname = SOP.Name; | 282 | objectname = SOP.Name; |
287 | } | 283 | } |
288 | 284 | ||
289 | |||
290 | if ((ts.name != entname) && (ts.name != avatarname) && (ts.name != objectname)) | 285 | if ((ts.name != entname) && (ts.name != avatarname) && (ts.name != objectname)) |
291 | { | 286 | { |
292 | keep = false; | 287 | keep = false; |
293 | } | 288 | } |
294 | |||
295 | |||
296 | } | 289 | } |
297 | 290 | ||
298 | if (keep == true) SensedObjects.Add(ent.UUID); | 291 | if (keep == true) SensedObjects.Add(ent.UUID); |
@@ -326,7 +319,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
326 | } | 319 | } |
327 | else | 320 | else |
328 | { | 321 | { |
329 | |||
330 | m_CmdManager.m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "sensor", EventQueueManager.llDetectNull, | 322 | m_CmdManager.m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "sensor", EventQueueManager.llDetectNull, |
331 | new object[] { SensedObjects.Length }); | 323 | new object[] { SensedObjects.Length }); |
332 | } | 324 | } |