From 6faa8d8d68ba5468e3bbcc8c68db499b28c072a9 Mon Sep 17 00:00:00 2001
From: Tedd Hansen <tedd@konge.net>
Date: Sat, 18 Aug 2007 21:31:35 +0000
Subject: [PATCH] Script loads into separate AppDomain without errors. Events
 and llFunctions not working yet.

---
 .../ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 4 +++-
 .../ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs   | 3 +--
 .../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs  | 2 +-
 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 f41cd598a0..de61ab73d3 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 ff1676e6aa..84fa9eb65f 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 15de03b979..297a45c3bc 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;