Fixed error on shutdown caused by ThreadAbortException sending message through already disposed logger. Thanks ckrinke

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
             //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");

             parameters.GenerateExecutable = false;

             parameters.OutputAssembly = OutFile;

-            //parameters.IncludeDebugInformation = false;

+            parameters.IncludeDebugInformation = false;

             CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);

 

             // 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
                     }

                     catch (Exception e)

                     {

-                        myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString());

+                        //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString());

                     }

                 }

             }

@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             } // try

             catch (ThreadAbortException tae)

             {

-                myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);

+                //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);

             }

         }