aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authoropensim mirror account2010-11-08 04:50:04 -0800
committeropensim mirror account2010-11-08 04:50:04 -0800
commit4a20a544d67bec4243208fe64e09bc5a260dc00b (patch)
tree6663b9a8f36fa5e21eb1c5f2560f8e177066ba57 /OpenSim/Region/ClientStack
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.zip
opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.gz
opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.bz2
opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 821f679..b5d8ec8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
615 615
616 // UseCircuitCode handling 616 // UseCircuitCode handling
617 if (packet.Type == PacketType.UseCircuitCode) 617 if (packet.Type == PacketType.UseCircuitCode)
618 { 618 {
619 object[] array = new object[] { buffer, packet }; 619 object[] array = new object[] { buffer, packet };
620 620
621 if (m_asyncPacketHandling) 621 if (m_asyncPacketHandling)
@@ -843,7 +843,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
843 843
844 m_log.DebugFormat( 844 m_log.DebugFormat(
845 "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 845 "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
846 buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); 846 buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
847 } 847 }
848 848
849 private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) 849 private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)