Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
This commit is contained in:
Melanie
2011-10-25 01:36:39 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -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;