Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.csavinationmerge
commit
8e69dde397
|
@ -684,7 +684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
|||
lock(m_Script)
|
||||
{
|
||||
|
||||
//m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
|
||||
//m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
|
||||
|
||||
m_DetectParams = data.DetectParams;
|
||||
|
||||
|
|
|
@ -1083,7 +1083,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
|
||||
IScriptInstance instance = (ScriptInstance) parms;
|
||||
|
||||
//m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance);
|
||||
//m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
|
||||
|
||||
return instance.EventProcessor();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue