aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-19 20:24:07 +0100
committerJustin Clark-Casey (justincc)2011-10-19 20:24:07 +0100
commit116fbe8258e336be3f6ac1e11119214629799faa (patch)
treec014c6d455b900f1736f5b8eb4ca278f920b67b8 /OpenSim/Region/ScriptEngine/Shared
parentAdd "show scripts" command to show all scripts currently known to the script ... (diff)
downloadopensim-SC_OLD-116fbe8258e336be3f6ac1e11119214629799faa.zip
opensim-SC_OLD-116fbe8258e336be3f6ac1e11119214629799faa.tar.gz
opensim-SC_OLD-116fbe8258e336be3f6ac1e11119214629799faa.tar.bz2
opensim-SC_OLD-116fbe8258e336be3f6ac1e11119214629799faa.tar.xz
add current script status to "scripts show" command (running, suspended, etc.)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs9
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 3313b18..9d48e94 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -95,7 +95,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
95 private bool m_startedFromSavedState; 95 private bool m_startedFromSavedState;
96 private UUID m_CurrentStateHash; 96 private UUID m_CurrentStateHash;
97 private UUID m_RegionID; 97 private UUID m_RegionID;
98 private bool m_Suspended = false;
99 98
100 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> 99 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
101 m_LineMap; 100 m_LineMap;
@@ -139,6 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
139 set { m_RunEvents = value; } 138 set { m_RunEvents = value; }
140 } 139 }
141 140
141 public bool Suspended { get; set; }
142
142 public bool ShuttingDown 143 public bool ShuttingDown
143 { 144 {
144 get { return m_ShuttingDown; } 145 get { return m_ShuttingDown; }
@@ -644,7 +645,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
644 /// <returns></returns> 645 /// <returns></returns>
645 public object EventProcessor() 646 public object EventProcessor()
646 { 647 {
647 if (m_Suspended) 648 if (Suspended)
648 return 0; 649 return 0;
649 650
650 lock (m_Script) 651 lock (m_Script)
@@ -1026,12 +1027,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1026 1027
1027 public void Suspend() 1028 public void Suspend()
1028 { 1029 {
1029 m_Suspended = true; 1030 Suspended = true;
1030 } 1031 }
1031 1032
1032 public void Resume() 1033 public void Resume()
1033 { 1034 {
1034 m_Suspended = false; 1035 Suspended = false;
1035 } 1036 }
1036 } 1037 }
1037} 1038}