diff options
author | UbitUmarov | 2018-01-22 21:43:21 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-22 21:43:21 +0000 |
commit | af9bff7ed29467a940087d1b8f29a5afee76b351 (patch) | |
tree | 37261d57bc32be2e834f82ebc403f3e5f81d052a /OpenSim/Region/ClientStack/Linden/UDP | |
parent | Ooops... fix the parentesis (diff) | |
download | opensim-SC_OLD-af9bff7ed29467a940087d1b8f29a5afee76b351.zip opensim-SC_OLD-af9bff7ed29467a940087d1b8f29a5afee76b351.tar.gz opensim-SC_OLD-af9bff7ed29467a940087d1b8f29a5afee76b351.tar.bz2 opensim-SC_OLD-af9bff7ed29467a940087d1b8f29a5afee76b351.tar.xz |
try fix mantis 8283
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index 8dd96d6..f362b06 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |||
@@ -228,14 +228,23 @@ namespace OpenMetaverse | |||
228 | { | 228 | { |
229 | m_log.Debug("[UDPBASE]: Failed to increase default TTL"); | 229 | m_log.Debug("[UDPBASE]: Failed to increase default TTL"); |
230 | } | 230 | } |
231 | |||
231 | try | 232 | try |
232 | { | 233 | { |
233 | // This udp socket flag is not supported under mono, | 234 | // This udp socket flag is not supported under mono, |
234 | // so we'll catch the exception and continue | 235 | // so we'll catch the exception and continue |
235 | m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null); | 236 | // Try does not protect some mono versions on mac |
236 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set"); | 237 | if(Util.IsWindows()) |
238 | { | ||
239 | m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null); | ||
240 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set"); | ||
241 | } | ||
242 | else | ||
243 | { | ||
244 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); | ||
245 | } | ||
237 | } | 246 | } |
238 | catch (SocketException) | 247 | catch |
239 | { | 248 | { |
240 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); | 249 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); |
241 | } | 250 | } |