aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2007-08-25 22:26:27 +0000
committerTedd Hansen2007-08-25 22:26:27 +0000
commit0cd6d26adb5f898e6e1b4595d76d25d075a50cf4 (patch)
treee08099be7e4eb3faaf75e1b2cd9d2dbfd6f5999f /OpenSim
parentForgot mutex lock on List<> for timers (diff)
downloadopensim-SC_OLD-0cd6d26adb5f898e6e1b4595d76d25d075a50cf4.zip
opensim-SC_OLD-0cd6d26adb5f898e6e1b4595d76d25d075a50cf4.tar.gz
opensim-SC_OLD-0cd6d26adb5f898e6e1b4595d76d25d075a50cf4.tar.bz2
opensim-SC_OLD-0cd6d26adb5f898e6e1b4595d76d25d075a50cf4.tar.xz
Fixed error on shutdown caused by ThreadAbortException sending message through already disposed logger. Thanks ckrinke
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index a700489..0cce317 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
87 //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment"); 87 //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
88 parameters.GenerateExecutable = false; 88 parameters.GenerateExecutable = false;
89 parameters.OutputAssembly = OutFile; 89 parameters.OutputAssembly = OutFile;
90 //parameters.IncludeDebugInformation = false; 90 parameters.IncludeDebugInformation = false;
91 CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script); 91 CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
92 92
93 // Go through errors 93 // Go through errors
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index c62e862..99971a5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
110 } 110 }
111 catch (Exception e) 111 catch (Exception e)
112 { 112 {
113 myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); 113 //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString());
114 } 114 }
115 } 115 }
116 } 116 }
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
186 } // try 186 } // try
187 catch (ThreadAbortException tae) 187 catch (ThreadAbortException tae)
188 { 188 {
189 myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); 189 //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);
190 } 190 }
191 } 191 }
192 192