Fixed error on shutdown caused by ThreadAbortException sending message through already disposed logger. Thanks ckrinke
parent
53ef427e9e
commit
0cd6d26adb
|
@ -87,7 +87,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
|
||||||
//parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
|
//parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
|
||||||
parameters.GenerateExecutable = false;
|
parameters.GenerateExecutable = false;
|
||||||
parameters.OutputAssembly = OutFile;
|
parameters.OutputAssembly = OutFile;
|
||||||
//parameters.IncludeDebugInformation = false;
|
parameters.IncludeDebugInformation = false;
|
||||||
CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
|
CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
|
||||||
|
|
||||||
// Go through errors
|
// Go through errors
|
||||||
|
|
|
@ -110,7 +110,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
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
|
} // try
|
||||||
catch (ThreadAbortException tae)
|
catch (ThreadAbortException tae)
|
||||||
{
|
{
|
||||||
myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);
|
//myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue