diff options
author | Tedd Hansen | 2007-09-15 14:22:38 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-09-15 14:22:38 +0000 |
commit | ed68a3894cc82e8e9bca6bcbf621c5297538c708 (patch) | |
tree | eb83e22f0be47bb817a51a0ee5a283f3a3e97ad3 /OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |
parent | Hopefully fixed the build error that I introduced with my last commit. (diff) | |
download | opensim-SC-ed68a3894cc82e8e9bca6bcbf621c5297538c708.zip opensim-SC-ed68a3894cc82e8e9bca6bcbf621c5297538c708.tar.gz opensim-SC-ed68a3894cc82e8e9bca6bcbf621c5297538c708.tar.bz2 opensim-SC-ed68a3894cc82e8e9bca6bcbf621c5297538c708.tar.xz |
Now loading "OpenSim.Region.ScriptEngine.Common.dll" into scripts AppDomain and "using OpenSim.Region.ScriptEngine.Common;" at start of script when converted from LSL. Vectors and rotations now works.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 7 |
1 files changed, 5 insertions, 2 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; |