diff options
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index cf25189..5a50714 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -684,7 +684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 684 | lock(m_Script) | 684 | lock(m_Script) |
| 685 | { | 685 | { |
| 686 | 686 | ||
| 687 | //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); | 687 | //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); |
| 688 | 688 | ||
| 689 | m_DetectParams = data.DetectParams; | 689 | m_DetectParams = data.DetectParams; |
| 690 | 690 | ||