diff options
author | Justin Clark-Casey (justincc) | 2012-06-08 01:51:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-08 01:51:28 +0100 |
commit | d73805d7f488e45a00a2d25c08876d400083d27f (patch) | |
tree | a7dd880061982423c2cf3668483da17c8fe5ad8b /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
parent | Store already retrieve IClientAPI in IncomingPacket structure for later use r... (diff) | |
download | opensim-SC_OLD-d73805d7f488e45a00a2d25c08876d400083d27f.zip opensim-SC_OLD-d73805d7f488e45a00a2d25c08876d400083d27f.tar.gz opensim-SC_OLD-d73805d7f488e45a00a2d25c08876d400083d27f.tar.bz2 opensim-SC_OLD-d73805d7f488e45a00a2d25c08876d400083d27f.tar.xz |
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 55bda63..a292a6c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1391,13 +1391,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1391 | Packet packet = incomingPacket.Packet; | 1391 | Packet packet = incomingPacket.Packet; |
1392 | LLClientView client = incomingPacket.Client; | 1392 | LLClientView client = incomingPacket.Client; |
1393 | 1393 | ||
1394 | // Sanity check | ||
1395 | if (packet == null || client == null) | ||
1396 | { | ||
1397 | m_log.WarnFormat("[LLUDPSERVER]: Processing a packet with incomplete state. Packet=\"{0}\", Client=\"{1}\"", | ||
1398 | packet, client); | ||
1399 | } | ||
1400 | |||
1401 | if (client.IsActive) | 1394 | if (client.IsActive) |
1402 | { | 1395 | { |
1403 | m_currentIncomingClient = client; | 1396 | m_currentIncomingClient = client; |
@@ -1442,4 +1435,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1442 | RemoveClient(((LLClientView)client).UDPClient); | 1435 | RemoveClient(((LLClientView)client).UDPClient); |
1443 | } | 1436 | } |
1444 | } | 1437 | } |
1445 | } | 1438 | } \ No newline at end of file |