Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge

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

1 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 5a50714..ab46491 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -96,7 +96,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private bool m_startedFromSavedState;
         private UUID m_CurrentStateHash;
         private UUID m_RegionID;
-        private bool m_Suspended = false;
 
         private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
                 m_LineMap;
@@ -140,6 +139,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             set { m_RunEvents = value; }
         }
 
+        public bool Suspended { get; set; }
+
         public bool ShuttingDown
         {
             get { return m_ShuttingDown; }
@@ -651,7 +652,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             lock (m_EventQueue)
             {
-                if (m_Suspended)
+                if (Suspended)
                     return 0;
 
                 lock (m_Script)
@@ -1030,12 +1031,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void Suspend()
         {
-            m_Suspended = true;
+            Suspended = true;
         }
 
         public void Resume()
         {
-            m_Suspended = false;
+            Suspended = false;
         }
     }
 }