diff options
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 975e9cc..c437703 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1083,7 +1083,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1083 | 1083 | ||
| 1084 | IScriptInstance instance = (ScriptInstance) parms; | 1084 | IScriptInstance instance = (ScriptInstance) parms; |
| 1085 | 1085 | ||
| 1086 | //m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); | 1086 | //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance); |
| 1087 | 1087 | ||
| 1088 | return instance.EventProcessor(); | 1088 | return instance.EventProcessor(); |
| 1089 | } | 1089 | } |