diff options
| author | UbitUmarov | 2017-05-23 07:35:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-23 07:35:02 +0100 |
| commit | c0bfaac0ac6873720b7c3721436ca54e93d5072c (patch) | |
| tree | 62f6b02569ba6dd968d76ad9bf2aa6ccf839d588 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | reenqueue poll events while conn is open, and not expired (diff) | |
| parent | dont log timeouts on stopped threads (diff) | |
| download | opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.zip opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.gz opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.bz2 opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.xz | |
merge master
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 0ccc683..2e39033 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -827,6 +827,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 827 | if (m_ScriptEngines.Contains(this)) | 827 | if (m_ScriptEngines.Contains(this)) |
| 828 | m_ScriptEngines.Remove(this); | 828 | m_ScriptEngines.Remove(this); |
| 829 | } | 829 | } |
| 830 | |||
| 831 | lock(m_Scripts) | ||
| 832 | m_ThreadPool.Shutdown(); | ||
| 830 | } | 833 | } |
| 831 | 834 | ||
| 832 | public object DoBackup(object o) | 835 | public object DoBackup(object o) |