Merge branch 'master' into careminster-presence-refactor

3 files changed, 152 insertions, 118 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index ae148a9..9f6ea35 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -81,6 +81,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 
         void PostEvent(EventParams data);
         
+        void Suspend();
+        void Resume();
+
         /// <summary>
         /// Process the next event queued for this script
         /// </summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6ecafd4..9ccc199 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -96,6 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private bool m_startedFromSavedState;
         private UUID m_CurrentStateHash;
         private UUID m_RegionID;
+        private bool m_Suspended = true;
 
         private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
                 m_LineMap;
@@ -640,158 +641,160 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         /// <returns></returns>
         public object EventProcessor()
         {
+            EventParams data = null;
 
-        EventParams data = null;
-
-        lock (m_EventQueue)
-        {
-            lock (m_Script)
+            lock (m_EventQueue)
             {
-                data = (EventParams) m_EventQueue.Dequeue();
-                if (data == null) // Shouldn't happen
+                if (m_Suspended)
+                    return 0;
+
+                lock (m_Script)
                 {
-                    if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
+                    data = (EventParams) m_EventQueue.Dequeue();
+                    if (data == null) // Shouldn't happen
                     {
-                        m_CurrentResult = m_Engine.QueueEventHandler(this);
+                        if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
+                        {
+                            m_CurrentResult = m_Engine.QueueEventHandler(this);
+                        }
+                        else
+                        {
+                            m_CurrentResult = null;
+                        }
+                        return 0;
                     }
-                    else
+
+                    if (data.EventName == "timer")
+                        m_TimerQueued = false;
+                    if (data.EventName == "control")
                     {
-                        m_CurrentResult = null;
+                        if (m_ControlEventsInQueue > 0)
+                            m_ControlEventsInQueue--;
                     }
-                    return 0;
-                }
-
-                if (data.EventName == "timer")
-                    m_TimerQueued = false;
-                if (data.EventName == "control")
-                {
-                    if (m_ControlEventsInQueue > 0)
-                        m_ControlEventsInQueue--;
+                    if (data.EventName == "collision")
+                        m_CollisionInQueue = false;
                 }
-                if (data.EventName == "collision")
-                    m_CollisionInQueue = false;
             }
-        }
-        lock(m_Script)
-        {
-            
-            //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
+            lock(m_Script)
+            {
+                
+                //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
 
-            m_DetectParams = data.DetectParams;
+                m_DetectParams = data.DetectParams;
 
-            if (data.EventName == "state") // Hardcoded state change
-            {
-//                m_log.DebugFormat("[Script] Script {0}.{1} state set to {2}",
-//                        m_PrimName, m_ScriptName, data.Params[0].ToString());
-                m_State=data.Params[0].ToString();
-                AsyncCommandManager.RemoveScript(m_Engine,
-                    m_LocalID, m_ItemID);
-
-                SceneObjectPart part = m_Engine.World.GetSceneObjectPart(
-                    m_LocalID);
-                if (part != null)
-                {
-                    part.SetScriptEvents(m_ItemID,
-                                         (int)m_Script.GetStateEventFlags(State));
-                }
-            }
-            else
-            {
-                if (m_Engine.World.PipeEventsForScript(m_LocalID) ||
-                    data.EventName == "control") // Don't freeze avies!
+                if (data.EventName == "state") // Hardcoded state change
                 {
+    //                m_log.DebugFormat("[Script] Script {0}.{1} state set to {2}",
+    //                        m_PrimName, m_ScriptName, data.Params[0].ToString());
+                    m_State=data.Params[0].ToString();
+                    AsyncCommandManager.RemoveScript(m_Engine,
+                        m_LocalID, m_ItemID);
+
                     SceneObjectPart part = m_Engine.World.GetSceneObjectPart(
                         m_LocalID);
-    //                m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
-    //                        m_PrimName, m_ScriptName, data.EventName, m_State);
-
-                    try
+                    if (part != null)
+                    {
+                        part.SetScriptEvents(m_ItemID,
+                                             (int)m_Script.GetStateEventFlags(State));
+                    }
+                }
+                else
+                {
+                    if (m_Engine.World.PipeEventsForScript(m_LocalID) ||
+                        data.EventName == "control") // Don't freeze avies!
                     {
-                        m_CurrentEvent = data.EventName;
-                        m_EventStart = DateTime.Now;
-                        m_InEvent = true;
+                        SceneObjectPart part = m_Engine.World.GetSceneObjectPart(
+                            m_LocalID);
+        //                m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
+        //                        m_PrimName, m_ScriptName, data.EventName, m_State);
 
-                        m_Script.ExecuteEvent(State, data.EventName, data.Params);
+                        try
+                        {
+                            m_CurrentEvent = data.EventName;
+                            m_EventStart = DateTime.Now;
+                            m_InEvent = true;
 
-                        m_InEvent = false;
-                        m_CurrentEvent = String.Empty;
+                            m_Script.ExecuteEvent(State, data.EventName, data.Params);
 
-                        if (m_SaveState)
-                        {
-                            // This will be the very first event we deliver
-                            // (state_entry) in default state
-                            //
+                            m_InEvent = false;
+                            m_CurrentEvent = String.Empty;
 
-                            SaveState(m_Assembly);
+                            if (m_SaveState)
+                            {
+                                // This will be the very first event we deliver
+                                // (state_entry) in default state
+                                //
 
-                            m_SaveState = false;
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message);
-                        m_InEvent = false;
-                        m_CurrentEvent = String.Empty;
+                                SaveState(m_Assembly);
 
-                        if ((!(e is TargetInvocationException) || (!(e.InnerException is SelfDeleteException) && !(e.InnerException is ScriptDeleteException))) && !(e is ThreadAbortException))
+                                m_SaveState = false;
+                            }
+                        }
+                        catch (Exception e)
                         {
-                            try
+                            // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message);
+                            m_InEvent = false;
+                            m_CurrentEvent = String.Empty;
+
+                            if ((!(e is TargetInvocationException) || (!(e.InnerException is SelfDeleteException) && !(e.InnerException is ScriptDeleteException))) && !(e is ThreadAbortException))
                             {
-                                // DISPLAY ERROR INWORLD
-                                string text = FormatException(e);
-
-                                if (text.Length > 1000)
-                                    text = text.Substring(0, 1000);
-                                m_Engine.World.SimChat(Utils.StringToBytes(text),
-                                                       ChatTypeEnum.DebugChannel, 2147483647,
-                                                       part.AbsolutePosition,
-                                                       part.Name, part.UUID, false);
+                                try
+                                {
+                                    // DISPLAY ERROR INWORLD
+                                    string text = FormatException(e);
+
+                                    if (text.Length > 1000)
+                                        text = text.Substring(0, 1000);
+                                    m_Engine.World.SimChat(Utils.StringToBytes(text),
+                                                           ChatTypeEnum.DebugChannel, 2147483647,
+                                                           part.AbsolutePosition,
+                                                           part.Name, part.UUID, false);
+                                }
+                                catch (Exception)
+                                {
+                                }
+                                // catch (Exception e2) // LEGIT: User Scripting
+                                // {
+                                    // m_log.Error("[SCRIPT]: "+
+                                      //           "Error displaying error in-world: " +
+                                        //         e2.ToString());
+                                 //    m_log.Error("[SCRIPT]: " +
+                                   //              "Errormessage: Error compiling script:\r\n" +
+                                     //            e.ToString());
+                                // }
                             }
-                            catch (Exception)
+                            else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
                             {
+                                m_InSelfDelete = true;
+                                if (part != null && part.ParentGroup != null)
+                                    m_Engine.World.DeleteSceneObject(part.ParentGroup, false);
+                            }
+                            else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
+                            {
+                                m_InSelfDelete = true;
+                                if (part != null && part.ParentGroup != null)
+                                    part.Inventory.RemoveInventoryItem(m_ItemID);
                             }
-                            // catch (Exception e2) // LEGIT: User Scripting
-                            // {
-                                // m_log.Error("[SCRIPT]: "+
-                                  //           "Error displaying error in-world: " +
-                                    //         e2.ToString());
-                             //    m_log.Error("[SCRIPT]: " +
-                               //              "Errormessage: Error compiling script:\r\n" +
-                                 //            e.ToString());
-                            // }
-                        }
-                        else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
-                        {
-                            m_InSelfDelete = true;
-                            if (part != null && part.ParentGroup != null)
-                                m_Engine.World.DeleteSceneObject(part.ParentGroup, false);
-                        }
-                        else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
-                        {
-                            m_InSelfDelete = true;
-                            if (part != null && part.ParentGroup != null)
-                                part.Inventory.RemoveInventoryItem(m_ItemID);
                         }
                     }
                 }
-            }
 
-            lock (m_EventQueue)
-            {
-                if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
-                {
-                    m_CurrentResult = m_Engine.QueueEventHandler(this);
-                }
-                else
+                lock (m_EventQueue)
                 {
-                    m_CurrentResult = null;
+                    if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
+                    {
+                        m_CurrentResult = m_Engine.QueueEventHandler(this);
+                    }
+                    else
+                    {
+                        m_CurrentResult = null;
+                    }
                 }
-            }
 
-            m_DetectParams = null;
+                m_DetectParams = null;
 
-            return 0;
-        }
+                return 0;
+            }
         }
 
         public int EventTime()
@@ -1018,5 +1021,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         {
             get { return m_RegionID; }
         }
+
+        public void Suspend()
+        {
+            m_Suspended = true;
+        }
+
+        public void Resume()
+        {
+            m_Suspended = false;
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 35d57d8..463b052 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1570,5 +1570,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 return new ArrayList();
             }
         }
+
+        public void SuspendScript(UUID itemID)
+        {
+            IScriptInstance instance = GetInstance(itemID);
+            if (instance == null)
+                return;
+
+            instance.Suspend();
+        }
+
+        public void ResumeScript(UUID itemID)
+        {
+            IScriptInstance instance = GetInstance(itemID);
+            if (instance == null)
+                return;
+
+            instance.Resume();
+        }
     }
 }