diff options
author | Melanie | 2012-08-29 11:35:21 +0200 |
---|---|---|
committer | Melanie | 2012-08-29 11:35:21 +0200 |
commit | 34f069493894654d23c18550182561a93ec023b0 (patch) | |
tree | f625947a66800530b68c3465dd5b7e3fb233da88 /OpenSim | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC-34f069493894654d23c18550182561a93ec023b0.zip opensim-SC-34f069493894654d23c18550182561a93ec023b0.tar.gz opensim-SC-34f069493894654d23c18550182561a93ec023b0.tar.bz2 opensim-SC-34f069493894654d23c18550182561a93ec023b0.tar.xz |
Remove Justin's addition to avoid sending incoming packets to inactive clients
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index f9ba14c..c817e44 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1478,8 +1478,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1478 | Packet packet = incomingPacket.Packet; | 1478 | Packet packet = incomingPacket.Packet; |
1479 | LLClientView client = incomingPacket.Client; | 1479 | LLClientView client = incomingPacket.Client; |
1480 | 1480 | ||
1481 | if (client.IsActive) | 1481 | // if (client.IsActive) |
1482 | { | 1482 | // { |
1483 | m_currentIncomingClient = client; | 1483 | m_currentIncomingClient = client; |
1484 | 1484 | ||
1485 | try | 1485 | try |
@@ -1506,13 +1506,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1506 | { | 1506 | { |
1507 | m_currentIncomingClient = null; | 1507 | m_currentIncomingClient = null; |
1508 | } | 1508 | } |
1509 | } | 1509 | // } |
1510 | else | 1510 | // else |
1511 | { | 1511 | // { |
1512 | m_log.DebugFormat( | 1512 | // m_log.DebugFormat( |
1513 | "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", | 1513 | // "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", |
1514 | packet.Type, client.Name, m_scene.RegionInfo.RegionName); | 1514 | // packet.Type, client.Name, m_scene.RegionInfo.RegionName); |
1515 | } | 1515 | // } |
1516 | } | 1516 | } |
1517 | 1517 | ||
1518 | protected void LogoutHandler(IClientAPI client) | 1518 | protected void LogoutHandler(IClientAPI client) |