From 9991955014a4a87269067517e23ad7a4c71c1866 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 2 Mar 2008 19:48:26 +0000
Subject: Applying Ahzzmandius' second patch from bug 701. ClientView triggers
 OnClose event before flushing packetqueue. Thank sAhzzmandius!

---
 OpenSim/Region/ClientStack/ClientView.cs  | 1 +
 OpenSim/Region/ClientStack/PacketQueue.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index ac18919..af5a8e5 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -384,6 +384,7 @@ namespace OpenSim.Region.ClientStack
         {
             // Pull Client out of Region
             m_log.Info("[CLIENT]: Close has been called");
+            m_packetQueue.Flush();
 
             //raiseevent on the packet server to Shutdown the circuit
             if (shutdownCircuit)
diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs
index 1a8450f..a04828f 100644
--- a/OpenSim/Region/ClientStack/PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/PacketQueue.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Region.ClientStack
             return SendQueue.Dequeue();
         }
 
-        private void Flush()
+        public void Flush()
         {
             lock (this)
             {
-- 
cgit v1.1