Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index ab46491..17c06e7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -650,11 +650,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         {
             EventParams data = null;
 
+            if (Suspended)
+                return 0;
+
             lock (m_EventQueue)
             {
-                if (Suspended)
-                    return 0;
-
                 lock (m_Script)
                 {
                     data = (EventParams) m_EventQueue.Dequeue();
@@ -685,7 +685,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;