diff options
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index b0b4662..c26c54e 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -96,11 +96,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
96 | AppDomainSetup ads = new AppDomainSetup(); | 96 | AppDomainSetup ads = new AppDomainSetup(); |
97 | ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; | 97 | ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; |
98 | ads.DisallowBindingRedirects = false; | 98 | ads.DisallowBindingRedirects = false; |
99 | ads.DisallowCodeDownload = true; | 99 | ads.DisallowCodeDownload = true; |
100 | ads.LoaderOptimization = LoaderOptimization.MultiDomain; // Sounds good ;) | ||
100 | ads.ShadowCopyFiles = "true"; // Enabled shadowing | 101 | ads.ShadowCopyFiles = "true"; // Enabled shadowing |
101 | ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; | 102 | ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; |
102 | 103 | ||
103 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); | 104 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); |
105 | Console.WriteLine("Loading: " + AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString()); | ||
106 | AD.Load(AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll")); | ||
104 | 107 | ||
105 | // Return the new AppDomain | 108 | // Return the new AppDomain |
106 | return AD; | 109 | return AD; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index c70448b..ec6b962 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -18,8 +18,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
18 | dataTypes.Add("integer", "int"); | 18 | dataTypes.Add("integer", "int"); |
19 | dataTypes.Add("float", "double"); | 19 | dataTypes.Add("float", "double"); |
20 | dataTypes.Add("string", "string"); | 20 | dataTypes.Add("string", "string"); |
21 | dataTypes.Add("key", "string"); | 21 | dataTypes.Add("key", "string"); |
22 | dataTypes.Add("vector", "LSL_Types.Vector3"); | 22 | dataTypes.Add("vector", "LSL_Types.Vector3"); |
23 | dataTypes.Add("rotation", "LSL_Types.Quaternion"); | 23 | dataTypes.Add("rotation", "LSL_Types.Quaternion"); |
24 | dataTypes.Add("list", "list"); | 24 | dataTypes.Add("list", "list"); |
25 | dataTypes.Add("null", "null"); | 25 | dataTypes.Add("null", "null"); |
@@ -225,9 +225,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | ||
228 | // Add namespace, class name and inheritance | 228 | // Add namespace, class name and inheritance |
229 | 229 | ||
230 | Return = "";// + | 230 | Return = "" + |
231 | "using OpenSim.Region.ScriptEngine.Common;"; | ||
231 | //"using System; " + | 232 | //"using System; " + |
232 | //"using System.Collections.Generic; " + | 233 | //"using System.Collections.Generic; " + |
233 | //"using System.Text; " + | 234 | //"using System.Text; " + |