From 785a2cc729a9935a6a68a33ce2b7df107f40e918 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 10 Nov 2014 04:48:36 +0100
Subject: Remove JustinCCs UDP patch - it is harmful to Avination's grid
 management

---
 OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden/UDP')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index a09195c..0030dee 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -152,7 +152,9 @@ namespace OpenMetaverse
                     SocketType.Dgram,
                     ProtocolType.Udp);
 
-                m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
+                // OpenSim may need this but in AVN, this messes up automated
+                // sim restarts badly
+                //m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
 
                 try
                 {
@@ -416,4 +418,4 @@ namespace OpenMetaverse
             catch (ObjectDisposedException) { }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1