aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-02-10 22:25:59 +0000
committerTedd Hansen2008-02-10 22:25:59 +0000
commit9a04e0e1c4f0a959f826acce7277daf0132ef66d (patch)
tree35c2defb96722c0fd1d1788b358493a5959324d9
parentThe very beginnings of attachments (no detachments! :) (diff)
downloadopensim-SC_OLD-9a04e0e1c4f0a959f826acce7277daf0132ef66d.zip
opensim-SC_OLD-9a04e0e1c4f0a959f826acce7277daf0132ef66d.tar.gz
opensim-SC_OLD-9a04e0e1c4f0a959f826acce7277daf0132ef66d.tar.bz2
opensim-SC_OLD-9a04e0e1c4f0a959f826acce7277daf0132ef66d.tar.xz
We now support LSL state
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/IScript.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs2
5 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index f6d2b82..6262c64 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Common
80 return; 80 return;
81 } 81 }
82 82
83 string EventName = m_Script.State() + "_event_" + FunctionName; 83 string EventName = m_Script.State + "_event_" + FunctionName;
84 84
85//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined 85//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
86///#if DEBUG 86///#if DEBUG
diff --git a/OpenSim/Region/ScriptEngine/Common/IScript.cs b/OpenSim/Region/ScriptEngine/Common/IScript.cs
index 2e1b143..c392278 100644
--- a/OpenSim/Region/ScriptEngine/Common/IScript.cs
+++ b/OpenSim/Region/ScriptEngine/Common/IScript.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Region.ScriptEngine.Common
32{ 32{
33 public interface IScript 33 public interface IScript
34 { 34 {
35 string State(); 35 string State { get; set; }
36 Executor Exec { get; } 36 Executor Exec { get; }
37 string Source { get; set; } 37 string Source { get; set; }
38 void Start(LSL_BuiltIn_Commands_Interface BuiltIn_Commands); 38 void Start(LSL_BuiltIn_Commands_Interface BuiltIn_Commands);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
index 3aea72b..b6710f0 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs
@@ -102,9 +102,10 @@ namespace OpenSim.Region.ScriptEngine.Common
102 { 102 {
103 } 103 }
104 104
105 public string State() 105 public string State
106 { 106 {
107 return m_LSL_Functions.State(); 107 get { return m_LSL_Functions.State; }
108 set { m_LSL_Functions.State = value; }
108 } 109 }
109 110
110 111
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 441d2fd..ca7a2bd 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -70,9 +70,10 @@ namespace OpenSim.Region.ScriptEngine.Common
70 private DateTime m_timer = DateTime.Now; 70 private DateTime m_timer = DateTime.Now;
71 private string m_state = "default"; 71 private string m_state = "default";
72 72
73 public string State() 73 public string State
74 { 74 {
75 return m_state; 75 get { return m_state; }
76 set { m_state = value; }
76 } 77 }
77 78
78 // Object never expires 79 // Object never expires
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 9ebc08d..ba463df 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common
35 35
36 // Interface used for loading and executing scripts 36 // Interface used for loading and executing scripts
37 37
38 string State(); 38 string State { get; set; }
39 39
40 double llSin(double f); 40 double llSin(double f);
41 double llCos(double f); 41 double llCos(double f);