aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorBlueWall2011-11-26 17:20:20 -0500
committerBlueWall2011-11-26 17:20:20 -0500
commit19c10c892adc7168107e8866cf4d7d20b876e2a8 (patch)
tree6c6ed57160a010a17c95dbda6901f97dd845b9e4 /OpenSim/Region/ScriptEngine/Shared/Api
parentAdd missing property to llGetLinkPrimitiveParams (diff)
parentWhen removing an LSL sensor for a script (e.g. through llResetScript() or sta... (diff)
downloadopensim-SC_OLD-19c10c892adc7168107e8866cf4d7d20b876e2a8.zip
opensim-SC_OLD-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.gz
opensim-SC_OLD-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.bz2
opensim-SC_OLD-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 5527d14..3eeb23d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
140 List<SenseRepeatClass> NewSensors = new List<SenseRepeatClass>(); 140 List<SenseRepeatClass> NewSensors = new List<SenseRepeatClass>();
141 foreach (SenseRepeatClass ts in SenseRepeaters) 141 foreach (SenseRepeatClass ts in SenseRepeaters)
142 { 142 {
143 if (ts.localID != m_localID && ts.itemID != m_itemID) 143 if (ts.localID != m_localID || ts.itemID != m_itemID)
144 { 144 {
145 NewSensors.Add(ts); 145 NewSensors.Add(ts);
146 } 146 }