diff options
| author | Tedd Hansen | 2007-08-20 10:58:51 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2007-08-20 10:58:51 +0000 |
| commit | 33326c1a70815b9746eb2780655fa8be3620908a (patch) | |
| tree | 919a266ac9b9674691b437f27b048b0b01d55319 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |
| parent | Added "StopScriot()" to ScriptManager. Stops Executor from executing events i... (diff) | |
| download | opensim-SC_OLD-33326c1a70815b9746eb2780655fa8be3620908a.zip opensim-SC_OLD-33326c1a70815b9746eb2780655fa8be3620908a.tar.gz opensim-SC_OLD-33326c1a70815b9746eb2780655fa8be3620908a.tar.bz2 opensim-SC_OLD-33326c1a70815b9746eb2780655fa8be3620908a.tar.xz | |
Some minor changes + krinkec's updates to ll* functions.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 7f78790..2be65e3 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
| @@ -60,7 +60,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 60 | private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) | 60 | private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) |
| 61 | { | 61 | { |
| 62 | 62 | ||
| 63 | //Console.WriteLine("CurrentDomain_AssemblyResolve: " + args.Name); | 63 | //Console.WriteLine("ScriptManager.CurrentDomain_AssemblyResolve: " + args.Name); |
| 64 | return Assembly.GetExecutingAssembly().FullName == args.Name ? Assembly.GetExecutingAssembly() : null; | 64 | return Assembly.GetExecutingAssembly().FullName == args.Name ? Assembly.GetExecutingAssembly() : null; |
| 65 | 65 | ||
| 66 | } | 66 | } |