diff options
author | UbitUmarov | 2019-03-12 11:14:59 +0000 |
---|---|---|
committer | UbitUmarov | 2019-03-12 11:14:59 +0000 |
commit | 1b8999b1300b7b9cb17d610c677496114b650d5a (patch) | |
tree | 5b8281bf8b4a773e120a4eee9527a278b0bdea8c /OpenSim | |
parent | Merge branch 'master' of brain.opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-1b8999b1300b7b9cb17d610c677496114b650d5a.zip opensim-SC-1b8999b1300b7b9cb17d610c677496114b650d5a.tar.gz opensim-SC-1b8999b1300b7b9cb17d610c677496114b650d5a.tar.bz2 opensim-SC-1b8999b1300b7b9cb17d610c677496114b650d5a.tar.xz |
try to work around robust shutdown/quit blocking on mono
Diffstat (limited to 'OpenSim')
-rwxr-xr-x | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 14e21a2..790aa99 100755 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -309,7 +309,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
309 | { | 309 | { |
310 | Thread.ResetAbort(); | 310 | Thread.ResetAbort(); |
311 | // Shouldn't set this to 'false', the normal shutdown should cause things to exit | 311 | // Shouldn't set this to 'false', the normal shutdown should cause things to exit |
312 | // m_running = false; | 312 | // but robust is still not normal neither is mono |
313 | m_running = false; | ||
313 | } | 314 | } |
314 | catch (Exception e) | 315 | catch (Exception e) |
315 | { | 316 | { |