diff options
author | Teravus Ovares | 2008-04-15 16:49:06 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-15 16:49:06 +0000 |
commit | 331f26548bc414511b6c450107556e6e3484178a (patch) | |
tree | 3a44ba599386628e58b4aa2d7920117b7ef114da /OpenSim/Region/ScriptEngine/Common | |
parent | From: Dr Scofield <hud@zurich.ibm.com> (diff) | |
download | opensim-SC_OLD-331f26548bc414511b6c450107556e6e3484178a.zip opensim-SC_OLD-331f26548bc414511b6c450107556e6e3484178a.tar.gz opensim-SC_OLD-331f26548bc414511b6c450107556e6e3484178a.tar.bz2 opensim-SC_OLD-331f26548bc414511b6c450107556e6e3484178a.tar.xz |
Fixed LSL State support.
* Re-applied Tedd's patch that got overwritten.
* Replaced (state)\s+([^;\n\r]+)([\r\n\s];) with (state)\s+([^;\n\r]+)(;[\r\n\s])
* Added a state(string) method to BuiltIn_Commands_BaseClass
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index 3f6f5cc..cb4ca39 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |||
@@ -106,7 +106,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
106 | get { return m_LSL_Functions.State; } | 106 | get { return m_LSL_Functions.State; } |
107 | set { m_LSL_Functions.State = value; } | 107 | set { m_LSL_Functions.State = value; } |
108 | } | 108 | } |
109 | 109 | public void state(string state) | |
110 | { | ||
111 | State = state; | ||
112 | |||
113 | } | ||
110 | 114 | ||
111 | 115 | ||
112 | public void Start(BuilIn_Commands LSL_Functions) | 116 | public void Start(BuilIn_Commands LSL_Functions) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index a2bc397..1a7d044 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -79,7 +79,15 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
79 | if (m_state != value) | 79 | if (m_state != value) |
80 | { | 80 | { |
81 | m_state = value; | 81 | m_state = value; |
82 | m_ScriptEngine.m_EventManager.state_entry(m_localID); | 82 | try |
83 | { | ||
84 | m_ScriptEngine.m_EventManager.state_entry(m_localID); | ||
85 | |||
86 | } | ||
87 | catch (AppDomainUnloadedException) | ||
88 | { | ||
89 | System.Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance"); | ||
90 | } | ||
83 | } | 91 | } |
84 | } | 92 | } |
85 | } | 93 | } |