diff options
author | UbitUmarov | 2017-05-25 02:24:15 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-25 02:24:15 +0100 |
commit | 8195cd5153d736b5b5412e3fc3b5d6458d617ea9 (patch) | |
tree | af94b3bab2d0b21e26ad1e8e623cb2934ca6146c /OpenSim/Region | |
parent | make a few more threads background ones (diff) | |
download | opensim-SC_OLD-8195cd5153d736b5b5412e3fc3b5d6458d617ea9.zip opensim-SC_OLD-8195cd5153d736b5b5412e3fc3b5d6458d617ea9.tar.gz opensim-SC_OLD-8195cd5153d736b5b5412e3fc3b5d6458d617ea9.tar.bz2 opensim-SC_OLD-8195cd5153d736b5b5412e3fc3b5d6458d617ea9.tar.xz |
another one
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 524f2be..5977f40 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim | |||
143 | //Mono.Unix.Native.Signum signal = signals [index].Signum; | 143 | //Mono.Unix.Native.Signum signal = signals [index].Signum; |
144 | MainConsole.Instance.RunCommand("shutdown"); | 144 | MainConsole.Instance.RunCommand("shutdown"); |
145 | } | 145 | } |
146 | }); | 146 | }); |
147 | #endif | 147 | #endif |
148 | 148 | ||
149 | /// <summary> | 149 | /// <summary> |
@@ -165,6 +165,7 @@ namespace OpenSim | |||
165 | { | 165 | { |
166 | new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) | 166 | new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) |
167 | }; | 167 | }; |
168 | signal_thread.IsBackground = true; | ||
168 | signal_thread.Start(); | 169 | signal_thread.Start(); |
169 | } | 170 | } |
170 | catch (Exception e) | 171 | catch (Exception e) |
@@ -485,6 +486,12 @@ namespace OpenSim | |||
485 | RunCommandScript(m_shutdownCommandsFile); | 486 | RunCommandScript(m_shutdownCommandsFile); |
486 | } | 487 | } |
487 | 488 | ||
489 | if (m_timedScript != "disabled") | ||
490 | { | ||
491 | m_scriptTimer.Dispose(); | ||
492 | m_timedScript = "disabled"; | ||
493 | } | ||
494 | |||
488 | base.ShutdownSpecific(); | 495 | base.ShutdownSpecific(); |
489 | } | 496 | } |
490 | 497 | ||