Applying Ahzzmandius' second patch from bug 701.

ClientView triggers OnClose event before flushing packetqueue. 
Thank sAhzzmandius!

2 files changed, 2 insertions, 1 deletions

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)
             {