diff options
| author | UbitUmarov | 2019-11-10 19:14:12 +0000 |
|---|---|---|
| committer | UbitUmarov | 2019-11-10 19:14:12 +0000 |
| commit | ee68085628b1c88f6ab5879aaec5bc477d0fc43d (patch) | |
| tree | e8c897144e296a17b73d00e009591b481c7fab29 /OpenSim/Region | |
| parent | terraforming changes: comment a debug message (diff) | |
| download | opensim-SC-ee68085628b1c88f6ab5879aaec5bc477d0fc43d.zip opensim-SC-ee68085628b1c88f6ab5879aaec5bc477d0fc43d.tar.gz opensim-SC-ee68085628b1c88f6ab5879aaec5bc477d0fc43d.tar.bz2 opensim-SC-ee68085628b1c88f6ab5879aaec5bc477d0fc43d.tar.xz | |
SIO_UDP_CONNRESET should work on macs now, thx Gavin
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index 49aca3c..8b2f84f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |||
| @@ -261,15 +261,16 @@ namespace OpenMetaverse | |||
| 261 | // This udp socket flag is not supported under mono, | 261 | // This udp socket flag is not supported under mono, |
| 262 | // so we'll catch the exception and continue | 262 | // so we'll catch the exception and continue |
| 263 | // Try does not protect some mono versions on mac | 263 | // Try does not protect some mono versions on mac |
| 264 | if(Util.IsWindows()) | 264 | // this may work now on all platforms |
| 265 | { | 265 | //if(Util.IsWindows()) |
| 266 | //{ | ||
| 266 | m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null); | 267 | m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null); |
| 267 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set"); | 268 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set"); |
| 268 | } | 269 | //} |
| 269 | else | 270 | //else |
| 270 | { | 271 | //{ |
| 271 | m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); | 272 | // m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); |
| 272 | } | 273 | //} |
| 273 | } | 274 | } |
| 274 | catch | 275 | catch |
| 275 | { | 276 | { |