From 7308f35a96b734e905eb997b52a4dd61bfd79cfa Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 8 Nov 2008 21:08:01 +0000 Subject: [PATCH] * Fixed issue where incorrect braces nesting resulted in a section of PacketQueue getting disabled. * This means the recent memory fix should now be working correctly - so the current largest memory leak should be fixed. AssetCache still needs to be addressed however. --- .../ClientStack/LindenUDP/LLPacketHandler.cs | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 7a66925664..9dbb00b52c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -768,35 +768,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP // If we sent a killpacket if (packet is KillPacket) - { Abort(); - // Actually make the byte array and send it - byte[] sendbuffer = packet.ToBytes(); + // Actually make the byte array and send it + byte[] sendbuffer = packet.ToBytes(); - //m_log.DebugFormat( - // "[CLIENT]: In {0} sending packet {1}", - // m_Client.Scene.RegionInfo.ExternalEndPoint.Port, packet.Header.Sequence); + //m_log.DebugFormat( + // "[CLIENT]: In {0} sending packet {1}", + // m_Client.Scene.RegionInfo.ExternalEndPoint.Port, packet.Header.Sequence); - if (packet.Header.Zerocoded) - { - int packetsize = Helpers.ZeroEncode(sendbuffer, - sendbuffer.Length, m_ZeroOutBuffer); - m_PacketServer.SendPacketTo(m_ZeroOutBuffer, packetsize, - SocketFlags.None, m_Client.CircuitCode); - } - else - { - // Need some extra space in case we need to add proxy - // information to the message later - Buffer.BlockCopy(sendbuffer, 0, m_ZeroOutBuffer, 0, - sendbuffer.Length); - m_PacketServer.SendPacketTo(m_ZeroOutBuffer, - sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); - } - - PacketPool.Instance.ReturnPacket(packet); + if (packet.Header.Zerocoded) + { + int packetsize = Helpers.ZeroEncode(sendbuffer, + sendbuffer.Length, m_ZeroOutBuffer); + m_PacketServer.SendPacketTo(m_ZeroOutBuffer, packetsize, + SocketFlags.None, m_Client.CircuitCode); } + else + { + // Need some extra space in case we need to add proxy + // information to the message later + Buffer.BlockCopy(sendbuffer, 0, m_ZeroOutBuffer, 0, + sendbuffer.Length); + m_PacketServer.SendPacketTo(m_ZeroOutBuffer, + sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); + } + + PacketPool.Instance.ReturnPacket(packet); } private void Abort()