From 9a04e0e1c4f0a959f826acce7277daf0132ef66d Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sun, 10 Feb 2008 22:25:59 +0000 Subject: [PATCH] We now support LSL state --- OpenSim/Region/ScriptEngine/Common/Executor.cs | 2 +- OpenSim/Region/ScriptEngine/Common/IScript.cs | 2 +- OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs | 5 +++-- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 5 +++-- .../ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs index f6d2b8295b..6262c64738 100644 --- a/OpenSim/Region/ScriptEngine/Common/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs @@ -80,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Common return; } - string EventName = m_Script.State() + "_event_" + FunctionName; + string EventName = m_Script.State + "_event_" + FunctionName; //cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined ///#if DEBUG diff --git a/OpenSim/Region/ScriptEngine/Common/IScript.cs b/OpenSim/Region/ScriptEngine/Common/IScript.cs index 2e1b143903..c392278581 100644 --- a/OpenSim/Region/ScriptEngine/Common/IScript.cs +++ b/OpenSim/Region/ScriptEngine/Common/IScript.cs @@ -32,7 +32,7 @@ namespace OpenSim.Region.ScriptEngine.Common { public interface IScript { - string State(); + string State { get; set; } Executor Exec { get; } string Source { get; set; } 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 3aea72ba9b..b6710f0037 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 { } - public string State() + public string State { - return m_LSL_Functions.State(); + get { return m_LSL_Functions.State; } + set { m_LSL_Functions.State = value; } } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 441d2fdb1a..ca7a2bdcf9 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 private DateTime m_timer = DateTime.Now; private string m_state = "default"; - public string State() + public string State { - return m_state; + get { return m_state; } + set { m_state = value; } } // 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 9ebc08d036..ba463df765 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 // Interface used for loading and executing scripts - string State(); + string State { get; set; } double llSin(double f); double llCos(double f);