Script loads into separate AppDomain without errors. Events and llFunctions not working yet.

3 files changed, 5 insertions, 4 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
             "using System.Text;\r\n" +

             "using OpenSim.Region.ScriptEngine.Common;\r\n" +

             "namespace SecondLife {\r\n";

-            Return += "[Serializable] public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass {\r\n";

+            Return += "" + 

+                //"[Serializable] " +

+                "public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass {\r\n";

             Return += @"public Script() { }"+"\r\n";

             Return += Script;

             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;
 

 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL

 {

-    [Serializable]

-    public class LSL_BaseClass : LSL_BuiltIn_Commands_Interface

+    public class LSL_BaseClass : MarshalByRefObject, LSL_BuiltIn_Commands_Interface

     {

 

         public LSL_BuiltIn_Commands_Interface m_LSL_Functions;

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 15de03b..297a45c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -14,7 +14,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
     /// <summary>

     /// Contains all LSL ll-functions. This class will be in Default AppDomain.

     /// </summary>

-    public class LSL_BuiltIn_Commands: LSL_BuiltIn_Commands_Interface

+    public class LSL_BuiltIn_Commands: MarshalByRefObject, LSL_BuiltIn_Commands_Interface

     {

         private System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();

         private ScriptManager m_manager;