diff options
author | Tedd Hansen | 2007-08-18 21:31:35 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-18 21:31:35 +0000 |
commit | 6faa8d8d68ba5468e3bbcc8c68db499b28c072a9 (patch) | |
tree | 480caa3f0ca1741fae3097f8f44902a82e1e9c40 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL | |
parent | Moved OpenSim.Region.ScriptEngine.Common.dll from bin\ScriptEngine\ to bin\ f... (diff) | |
download | opensim-SC_OLD-6faa8d8d68ba5468e3bbcc8c68db499b28c072a9.zip opensim-SC_OLD-6faa8d8d68ba5468e3bbcc8c68db499b28c072a9.tar.gz opensim-SC_OLD-6faa8d8d68ba5468e3bbcc8c68db499b28c072a9.tar.bz2 opensim-SC_OLD-6faa8d8d68ba5468e3bbcc8c68db499b28c072a9.tar.xz |
Script loads into separate AppDomain without errors. Events and llFunctions not working yet.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index f41cd59..de61ab7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -233,7 +233,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
233 | "using System.Text;\r\n" + | 233 | "using System.Text;\r\n" + |
234 | "using OpenSim.Region.ScriptEngine.Common;\r\n" + | 234 | "using OpenSim.Region.ScriptEngine.Common;\r\n" + |
235 | "namespace SecondLife {\r\n"; | 235 | "namespace SecondLife {\r\n"; |
236 | Return += "[Serializable] public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass {\r\n"; | 236 | Return += "" + |
237 | //"[Serializable] " + | ||
238 | "public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass {\r\n"; | ||
237 | Return += @"public Script() { }"+"\r\n"; | 239 | Return += @"public Script() { }"+"\r\n"; |
238 | Return += Script; | 240 | Return += Script; |
239 | Return += "} }\r\n"; | 241 | Return += "} }\r\n"; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index ff1676e..84fa9eb 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -7,8 +7,7 @@ using System.Threading; | |||
7 | 7 | ||
8 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | 8 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL |
9 | { | 9 | { |
10 | [Serializable] | 10 | public class LSL_BaseClass : MarshalByRefObject, LSL_BuiltIn_Commands_Interface |
11 | public class LSL_BaseClass : LSL_BuiltIn_Commands_Interface | ||
12 | { | 11 | { |
13 | 12 | ||
14 | public LSL_BuiltIn_Commands_Interface m_LSL_Functions; | 13 | public LSL_BuiltIn_Commands_Interface m_LSL_Functions; |