diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 45bede3..dcfe615 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) |