diff options
| author | BlueWall | 2011-11-26 17:20:20 -0500 |
|---|---|---|
| committer | BlueWall | 2011-11-26 17:20:20 -0500 |
| commit | 19c10c892adc7168107e8866cf4d7d20b876e2a8 (patch) | |
| tree | 6c6ed57160a010a17c95dbda6901f97dd845b9e4 /OpenSim/Region/ScriptEngine | |
| parent | Add missing property to llGetLinkPrimitiveParams (diff) | |
| parent | When removing an LSL sensor for a script (e.g. through llResetScript() or sta... (diff) | |
| download | opensim-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')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
2 files changed, 2 insertions, 2 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 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f9af9c1..f9d6eee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 55 | { | 55 | { |
| 56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance | 56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance |
| 57 | { | 57 | { |
| 58 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 59 | 59 | ||
| 60 | private IScriptEngine m_Engine; | 60 | private IScriptEngine m_Engine; |
| 61 | private IScriptWorkItem m_CurrentResult = null; | 61 | private IScriptWorkItem m_CurrentResult = null; |