diff options
author | Tedd Hansen | 2007-08-18 20:53:13 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-18 20:53:13 +0000 |
commit | 551f2af39f2bc003bef9ba388ccb4a6d87f2f36b (patch) | |
tree | 6338597d88a959f5d9391439fb2bb4978b897df5 /OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |
parent | Working on AppDomains. Scripting is now officially broken. :] (diff) | |
download | opensim-SC-551f2af39f2bc003bef9ba388ccb4a6d87f2f36b.zip opensim-SC-551f2af39f2bc003bef9ba388ccb4a6d87f2f36b.tar.gz opensim-SC-551f2af39f2bc003bef9ba388ccb4a6d87f2f36b.tar.bz2 opensim-SC-551f2af39f2bc003bef9ba388ccb4a6d87f2f36b.tar.xz |
LSL Compiler now only referring required assemblies (DotNetEngine and Common). Changed Vector and Rotation to custom types (stored in Common) that needs to be changed later. No longer using Axiom. Script support still broken.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index 2e1e3d1..7941ea2 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
71 | //ads.ApplicationName = "DotNetScriptEngine"; | 71 | //ads.ApplicationName = "DotNetScriptEngine"; |
72 | //ads.DynamicBase = ads.ApplicationBase; | 72 | //ads.DynamicBase = ads.ApplicationBase; |
73 | 73 | ||
74 | Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase); | 74 | //Console.WriteLine("AppDomain BaseDirectory: " + ads.ApplicationBase); |
75 | ads.DisallowBindingRedirects = false; | 75 | ads.DisallowBindingRedirects = false; |
76 | ads.DisallowCodeDownload = true; | 76 | ads.DisallowCodeDownload = true; |
77 | ads.ShadowCopyFiles = "true"; | 77 | ads.ShadowCopyFiles = "true"; |
@@ -95,13 +95,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
95 | 95 | ||
96 | } | 96 | } |
97 | 97 | ||
98 | Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase); | 98 | //Console.WriteLine("Assembly file: " + this.GetType().Assembly.CodeBase); |
99 | Console.WriteLine("Assembly name: " + this.GetType().ToString()); | 99 | //Console.WriteLine("Assembly name: " + this.GetType().ToString()); |
100 | //AD.CreateInstanceFrom(this.GetType().Assembly.CodeBase, "OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine"); | 100 | //AD.CreateInstanceFrom(this.GetType().Assembly.CodeBase, "OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine"); |
101 | 101 | ||
102 | //AD.Load(this.GetType().Assembly.CodeBase); | 102 | //AD.Load(this.GetType().Assembly.CodeBase); |
103 | 103 | ||
104 | Console.WriteLine("Done preparing new appdomain."); | 104 | Console.WriteLine("Done preparing new AppDomain."); |
105 | return AD; | 105 | return AD; |
106 | 106 | ||
107 | } | 107 | } |