diff options
author | Teravus Ovares | 2008-04-17 15:58:50 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-17 15:58:50 +0000 |
commit | 4ee368785db1d278c1bd664b4fcad2dd4c192ffd (patch) | |
tree | de49a143ae4b2f0d1d7b522a45c68cb0219d690a /OpenSim/Region/ClientStack | |
parent | From: Alan M Webb <awebb@vnet.ibm.com> (diff) | |
download | opensim-SC-4ee368785db1d278c1bd664b4fcad2dd4c192ffd.zip opensim-SC-4ee368785db1d278c1bd664b4fcad2dd4c192ffd.tar.gz opensim-SC-4ee368785db1d278c1bd664b4fcad2dd4c192ffd.tar.bz2 opensim-SC-4ee368785db1d278c1bd664b4fcad2dd4c192ffd.tar.xz |
* Acks the first UseCircuitCode packet
* Implements Teleport One Agent Home
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 7a3cff1..89b0400 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -324,7 +324,7 @@ namespace OpenSim.Region.ClientStack | |||
324 | 324 | ||
325 | m_userEndPoint = remoteEP; | 325 | m_userEndPoint = remoteEP; |
326 | m_proxyEndPoint = proxyEP; | 326 | m_proxyEndPoint = proxyEP; |
327 | 327 | ||
328 | m_startpos = m_authenticateSessionsHandler.GetPosition(circuitCode); | 328 | m_startpos = m_authenticateSessionsHandler.GetPosition(circuitCode); |
329 | 329 | ||
330 | // While working on this, the BlockingQueue had me fooled for a bit. | 330 | // While working on this, the BlockingQueue had me fooled for a bit. |
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 3d1512f..7a4cc97 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -295,6 +295,17 @@ namespace OpenSim.Region.ClientStack | |||
295 | // new client | 295 | // new client |
296 | m_log.Debug("[UDPSERVER]: Adding New Client"); | 296 | m_log.Debug("[UDPSERVER]: Adding New Client"); |
297 | AddNewClient(packet); | 297 | AddNewClient(packet); |
298 | |||
299 | UseCircuitCodePacket p = (UseCircuitCodePacket)packet; | ||
300 | |||
301 | // Ack the first UseCircuitCode packet | ||
302 | PacketAckPacket ack_it = (PacketAckPacket)PacketPool.Instance.GetPacket(PacketType.PacketAck); | ||
303 | // TODO: don't create new blocks if recycling an old packet | ||
304 | ack_it.Packets = new PacketAckPacket.PacketsBlock[1]; | ||
305 | ack_it.Packets[0] = new PacketAckPacket.PacketsBlock(); | ||
306 | ack_it.Packets[0].ID = packet.Header.Sequence; | ||
307 | ack_it.Header.Reliable = false; | ||
308 | SendPacketTo(ack_it.ToBytes(),ack_it.ToBytes().Length,SocketFlags.None,p.CircuitCode.Code); | ||
298 | } | 309 | } |
299 | else | 310 | else |
300 | { | 311 | { |