mirror of
https://github.com/opensim/opensim.git
synced 2026-07-04 09:55:55 +08:00
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user