diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index f40948f..25e10be 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1257,7 +1257,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1257 | // UseCircuitCode handling | 1257 | // UseCircuitCode handling |
1258 | if (packet.Type == PacketType.UseCircuitCode) | 1258 | if (packet.Type == PacketType.UseCircuitCode) |
1259 | { | 1259 | { |
1260 | m_log.DebugFormat("[ZZZ]: In the dungeon: UseCircuitCode"); | ||
1261 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the | 1260 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the |
1262 | // buffer. | 1261 | // buffer. |
1263 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | 1262 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; |
@@ -1271,7 +1270,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1271 | // Send ack straight away to let the viewer know that we got it. | 1270 | // Send ack straight away to let the viewer know that we got it. |
1272 | SendAckImmediate(endPoint, packet.Header.Sequence); | 1271 | SendAckImmediate(endPoint, packet.Header.Sequence); |
1273 | 1272 | ||
1274 | m_log.DebugFormat("[ZZZ]: In the dungeon: CompleteAgentMovement"); | ||
1275 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the | 1273 | // We need to copy the endpoint so that it doesn't get changed when another thread reuses the |
1276 | // buffer. | 1274 | // buffer. |
1277 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | 1275 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; |
@@ -2080,9 +2078,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2080 | Packet packet = incomingPacket.Packet; | 2078 | Packet packet = incomingPacket.Packet; |
2081 | LLClientView client = incomingPacket.Client; | 2079 | LLClientView client = incomingPacket.Client; |
2082 | 2080 | ||
2083 | if (packet is CompleteAgentMovementPacket) | ||
2084 | m_log.DebugFormat("[ZZZ]: Received CompleteAgentMovementPacket"); | ||
2085 | |||
2086 | if (client.IsActive) | 2081 | if (client.IsActive) |
2087 | { | 2082 | { |
2088 | m_currentIncomingClient = client; | 2083 | m_currentIncomingClient = client; |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 1ea0fd7..70fbfc3 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1008,7 +1008,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1008 | // Send the Update. If this returns true, we know the client has contacted the destination | 1008 | // Send the Update. If this returns true, we know the client has contacted the destination |
1009 | // via CompleteMovementIntoRegion, so we can let go. | 1009 | // via CompleteMovementIntoRegion, so we can let go. |
1010 | // If it returns false, something went wrong, and we need to abort. | 1010 | // If it returns false, something went wrong, and we need to abort. |
1011 | m_log.DebugFormat("[ZZZ]: Sending Update"); | ||
1012 | if (!UpdateAgent(reg, finalDestination, agent, sp)) | 1011 | if (!UpdateAgent(reg, finalDestination, agent, sp)) |
1013 | { | 1012 | { |
1014 | if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) | 1013 | if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) |