aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorTedd Hansen2007-08-18 18:53:03 +0000
committerTedd Hansen2007-08-18 18:53:03 +0000
commit6d10c6535847a65f3bc56398a609916174684729 (patch)
treec2828badeeed054a465f6c634ac7cc343c4ca4f7 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parentStarted on AppDomains for ScriptEngine. Moved llFunctions in LSL_BaseClass.cs... (diff)
downloadopensim-SC_OLD-6d10c6535847a65f3bc56398a609916174684729.zip
opensim-SC_OLD-6d10c6535847a65f3bc56398a609916174684729.tar.gz
opensim-SC_OLD-6d10c6535847a65f3bc56398a609916174684729.tar.bz2
opensim-SC_OLD-6d10c6535847a65f3bc56398a609916174684729.tar.xz
Moved LSL_BuiltIn_Commands_Interface.cs to a separate library (OpenSim.Region.ScriptEngine.Common). Fixed last compile error (forgot to include LSL_BuiltIn_Commands.cs).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 7155b09..1d2689d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
58 private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) 58 private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
59 { 59 {
60 60
61 Console.WriteLine("CurrentDomain_AssemblyResolve: " + args.Name); 61 //Console.WriteLine("CurrentDomain_AssemblyResolve: " + args.Name);
62 return Assembly.GetExecutingAssembly().FullName == args.Name ? Assembly.GetExecutingAssembly() : null; 62 return Assembly.GetExecutingAssembly().FullName == args.Name ? Assembly.GetExecutingAssembly() : null;
63 63
64 } 64 }
@@ -231,11 +231,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
231 //Console.WriteLine("Base directory: " + AppDomain.CurrentDomain.BaseDirectory); 231 //Console.WriteLine("Base directory: " + AppDomain.CurrentDomain.BaseDirectory);
232 232
233 //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); 233 //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");
234
235 //Type mytype = mbrt.GetType(); 234 //Type mytype = mbrt.GetType();
236
237
238
239 235
240 //Console.WriteLine("is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); 236 //Console.WriteLine("is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));
241 237