aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 5903661..7c21df2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
213 } 213 }
214 214
215 BeginReceive(); 215 BeginReceive();
216 216
217 if (packet != null) 217 if (packet != null)
218 { 218 {
219 try 219 try
@@ -297,11 +297,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
297 m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, 297 m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender,
298 ReceivedData, null); 298 ReceivedData, null);
299 299
300 // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. 300 // Ter: For some stupid reason ConnectionReset basically kills our async event structure..
301 // so therefore.. we've got to tell the server to BeginReceiveFrom again. 301 // so therefore.. we've got to tell the server to BeginReceiveFrom again.
302 // This will happen over and over until we've gone through all packets 302 // This will happen over and over until we've gone through all packets
303 // sent to and from this particular user. 303 // sent to and from this particular user.
304 // Stupid I know.. 304 // Stupid I know..
305 // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. 305 // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method.
306 } 306 }
307 catch (SocketException e) 307 catch (SocketException e)
@@ -329,7 +329,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
329 { 329 {
330 if (!(packet is UseCircuitCodePacket)) 330 if (!(packet is UseCircuitCodePacket))
331 return; 331 return;
332 332
333 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; 333 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
334 lock (clientCircuits) 334 lock (clientCircuits)
335 { 335 {
@@ -424,13 +424,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
424 public virtual void RemoveClientCircuit(uint circuitcode) 424 public virtual void RemoveClientCircuit(uint circuitcode)
425 { 425 {
426 EndPoint sendto = null; 426 EndPoint sendto = null;
427 if (clientCircuits_reverse.Contains(circuitcode)) 427 if (clientCircuits_reverse.Contains(circuitcode))
428 { 428 {
429 sendto = (EndPoint)clientCircuits_reverse[circuitcode]; 429 sendto = (EndPoint)clientCircuits_reverse[circuitcode];
430 430
431 clientCircuits_reverse.Remove(circuitcode); 431 clientCircuits_reverse.Remove(circuitcode);
432 432
433 lock (clientCircuits) 433 lock (clientCircuits)
434 { 434 {
435 if (sendto != null) 435 if (sendto != null)
436 { 436 {
@@ -442,7 +442,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 "[UDPSERVER]: endpoint for circuit code {0} in RemoveClientCircuit() was unexpectedly null!", circuitcode); 442 "[UDPSERVER]: endpoint for circuit code {0} in RemoveClientCircuit() was unexpectedly null!", circuitcode);
443 } 443 }
444 } 444 }
445 lock (proxyCircuits) 445 lock (proxyCircuits)
446 { 446 {
447 proxyCircuits.Remove(circuitcode); 447 proxyCircuits.Remove(circuitcode);
448 } 448 }