Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

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