From cade14c58c335503221753b10ec361898ce5f9d4 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 6 Dec 2009 05:14:17 +0000 Subject: [PATCH 1/2] Make ObjectSelect packet processing not use FireAndForget --- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 85961b98fe..99968574ec 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -964,7 +964,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP } if (packetInbox.Dequeue(100, ref incomingPacket)) - Util.FireAndForget(ProcessInPacket, incomingPacket); + { + if (incomingPacket.Packet.Type != PacketType.ObjectSelect) + Util.FireAndForget(ProcessInPacket, incomingPacket); + else + ProcessInPacket(incomingPacket); + } } catch (Exception ex) { From 23cd1b195424bb4a844e1f2397047e5d5080c5ad Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 6 Dec 2009 05:24:43 +0000 Subject: [PATCH 2/2] Revert "Make ObjectSelect packet processing not use FireAndForget" This reverts commit cade14c58c335503221753b10ec361898ce5f9d4. --- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 99968574ec..85961b98fe 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -964,12 +964,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } if (packetInbox.Dequeue(100, ref incomingPacket)) - { - if (incomingPacket.Packet.Type != PacketType.ObjectSelect) - Util.FireAndForget(ProcessInPacket, incomingPacket); - else - ProcessInPacket(incomingPacket); - } + Util.FireAndForget(ProcessInPacket, incomingPacket); } catch (Exception ex) {