Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

1 files changed, 25 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
index 6acc293..e1f8c4c 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
@@ -1535,15 +1535,38 @@ namespace OpenSim.Region.ScriptEngine.Yengine
          */
         public void QueueToStart(XMRInstance inst)
         {
-            if(inst.m_IState != XMRInstState.ONSTARTQ)
+            if (inst.m_IState != XMRInstState.ONSTARTQ)
                 throw new Exception("bad state");
 
-            lock(m_StartQueue)
+            lock (m_StartQueue)
                 m_StartQueue.InsertTail(inst);
 
             WakeUpOne();
         }
 
+        public void QueueToYield(XMRInstance inst)
+        {
+            if (inst.m_IState != XMRInstState.ONYIELDQ)
+                throw new Exception("bad state");
+
+            lock (m_YieldQueue)
+                m_YieldQueue.InsertTail(inst);
+
+            WakeUpOne();
+        }
+
+        public void RemoveFromSleep(XMRInstance inst)
+        {
+            lock (m_SleepQueue)
+            {
+                if (inst.m_IState != XMRInstState.ONSLEEPQ)
+                    return;
+
+                m_SleepQueue.Remove(inst);
+                inst.m_IState = XMRInstState.REMDFROMSLPQ;
+            }
+        }
+
         /**
          * @brief A script may be sleeping, in which case we wake it.
          */