aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorRobert Adams2019-02-27 07:49:52 -0800
committerRobert Adams2019-02-27 07:49:52 -0800
commitbd1b992aaf57154fd57403348a1ab63bfd918ad9 (patch)
tree45c627049706614e14de445e9dab2dcc9b072b9a /OpenSim/Region/ClientStack/Linden/UDP
parent combat module: those parcel changes are now handled elsewhere (diff)
downloadopensim-SC-bd1b992aaf57154fd57403348a1ab63bfd918ad9.zip
opensim-SC-bd1b992aaf57154fd57403348a1ab63bfd918ad9.tar.gz
opensim-SC-bd1b992aaf57154fd57403348a1ab63bfd918ad9.tar.bz2
opensim-SC-bd1b992aaf57154fd57403348a1ab63bfd918ad9.tar.xz
Add Thread.ResetAbort() to various thread loops to clean up errors on
shutdown. Fixes Mantis #8494. Threads are aborted when shutting down and ThreadAbortException is odd in that it is rethrown at the end of the catch unless the abort is reset. No functional changes but fewer error messages on shutdown.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rwxr-xr-x[-rw-r--r--]OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index f12b3b9..653f648 100644..100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1910,7 +1910,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1910 incomingPacket = null; 1910 incomingPacket = null;
1911 } 1911 }
1912 } 1912 }
1913 catch(Exception ex) 1913 catch (ThreadAbortException)
1914 {
1915 Thread.ResetAbort();
1916 }
1917 catch (Exception ex)
1914 { 1918 {
1915 m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex); 1919 m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex);
1916 } 1920 }