diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 7052e0e..fcb2cd0 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -268,7 +268,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
268 | // The packet grew larger than the bufferSize while zerocoding. | 268 | // The packet grew larger than the bufferSize while zerocoding. |
269 | // Remove the MSG_ZEROCODED flag and send the unencoded data | 269 | // Remove the MSG_ZEROCODED flag and send the unencoded data |
270 | // instead | 270 | // instead |
271 | m_log.Info("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding. Removing MSG_ZEROCODED flag"); | 271 | m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". Removing MSG_ZEROCODED flag"); |
272 | data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED); | 272 | data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED); |
273 | Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength); | 273 | Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength); |
274 | } | 274 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs index e78a4fe..fad2ea8 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs | |||
@@ -198,6 +198,9 @@ namespace OpenMetaverse | |||
198 | // to AsyncBeginReceive | 198 | // to AsyncBeginReceive |
199 | if (!m_shutdownFlag) | 199 | if (!m_shutdownFlag) |
200 | { | 200 | { |
201 | // start another receive - this keeps the server going! | ||
202 | AsyncBeginReceive(); | ||
203 | |||
201 | // get the buffer that was created in AsyncBeginReceive | 204 | // get the buffer that was created in AsyncBeginReceive |
202 | // this is the received data | 205 | // this is the received data |
203 | //WrappedObject<UDPPacketBuffer> wrappedBuffer = (WrappedObject<UDPPacketBuffer>)iar.AsyncState; | 206 | //WrappedObject<UDPPacketBuffer> wrappedBuffer = (WrappedObject<UDPPacketBuffer>)iar.AsyncState; |
@@ -216,13 +219,7 @@ namespace OpenMetaverse | |||
216 | } | 219 | } |
217 | catch (SocketException) { } | 220 | catch (SocketException) { } |
218 | catch (ObjectDisposedException) { } | 221 | catch (ObjectDisposedException) { } |
219 | finally | 222 | //finally { wrappedBuffer.Dispose(); } |
220 | { | ||
221 | // wrappedBuffer.Dispose(); | ||
222 | |||
223 | // start another receive - this keeps the server going! | ||
224 | AsyncBeginReceive(); | ||
225 | } | ||
226 | 223 | ||
227 | } | 224 | } |
228 | } | 225 | } |