aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
diff options
context:
space:
mode:
authorSean Dague2008-03-17 15:11:36 +0000
committerSean Dague2008-03-17 15:11:36 +0000
commitdba37a8722a375c77a31efa03c12c146126898d3 (patch)
tree89715aa67c3ba97d33ae1f5e50d31dbb952ce03b /OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
parent* Fixed prim creation in basic physics mode. ( BasicPhysics returns null prob... (diff)
downloadopensim-SC_OLD-dba37a8722a375c77a31efa03c12c146126898d3.zip
opensim-SC_OLD-dba37a8722a375c77a31efa03c12c146126898d3.tar.gz
opensim-SC_OLD-dba37a8722a375c77a31efa03c12c146126898d3.tar.bz2
opensim-SC_OLD-dba37a8722a375c77a31efa03c12c146126898d3.tar.xz
From: Alan M Webb <awebb@vnet.ibm.com>
Here's a diff of the changes I have made in support of the following LSL script functions. llSetScriptState llGetScriptState llCSV2List llListRandomize llList2ListStrided llListFindList llResetOtherScript llGetScriptName It was necessary to modify ExecutorBase in support of the ScriptState implementations. I also modified SceneObjectPart and SceneObjectPart.Inventory to corrects a quoting mismatch in the commentary that through off live parsing of the files. I also simplified the State definition at the start of BuiltinCommands.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
index 30c40f4..c272400 100644
--- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -42,6 +42,25 @@ namespace OpenSim.Region.ScriptEngine.Common
42 /// If set to False events will not be executed. 42 /// If set to False events will not be executed.
43 /// </summary> 43 /// </summary>
44 protected bool m_Running = true; 44 protected bool m_Running = true;
45 /// <summary>
46 /// True indicates that the ScriptManager has stopped
47 /// this script. This prevents a script that has been
48 /// stopped as part of deactivation from being
49 /// resumed by a pending llSetScriptState request.
50 /// </summary>
51 protected bool m_Disable = false;
52
53 /// <summary>
54 /// Indicate the scripts current running status.
55 /// </summary>
56 public bool Running
57 {
58 get { return m_Running; }
59 set {
60 if(!m_Disable)
61 m_Running = value;
62 }
63 }
45 64
46 /// <summary> 65 /// <summary>
47 /// Create a new instance of ExecutorBase 66 /// Create a new instance of ExecutorBase
@@ -102,6 +121,8 @@ namespace OpenSim.Region.ScriptEngine.Common
102 public void StopScript() 121 public void StopScript()
103 { 122 {
104 m_Running = false; 123 m_Running = false;
124 m_Disable = true;
105 } 125 }
126
106 } 127 }
107} 128}