aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-10 04:48:36 +0100
committerMelanie Thielker2014-11-10 04:48:36 +0100
commit785a2cc729a9935a6a68a33ce2b7df107f40e918 (patch)
tree5e2bb9c0606d952c86ffddad291269528ac8e0d4 /OpenSim/Region/ClientStack/Linden/UDP
parentOnly send the actual bakes to the bakes module (diff)
downloadopensim-SC-785a2cc729a9935a6a68a33ce2b7df107f40e918.zip
opensim-SC-785a2cc729a9935a6a68a33ce2b7df107f40e918.tar.gz
opensim-SC-785a2cc729a9935a6a68a33ce2b7df107f40e918.tar.bz2
opensim-SC-785a2cc729a9935a6a68a33ce2b7df107f40e918.tar.xz
Remove JustinCCs UDP patch - it is harmful to Avination's grid management
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs6
1 files changed, 4 insertions, 2 deletions
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
152 SocketType.Dgram, 152 SocketType.Dgram,
153 ProtocolType.Udp); 153 ProtocolType.Udp);
154 154
155 m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false); 155 // OpenSim may need this but in AVN, this messes up automated
156 // sim restarts badly
157 //m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
156 158
157 try 159 try
158 { 160 {
@@ -416,4 +418,4 @@ namespace OpenMetaverse
416 catch (ObjectDisposedException) { } 418 catch (ObjectDisposedException) { }
417 } 419 }
418 } 420 }
419} \ No newline at end of file 421}