aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-02 19:48:26 +0000
committerTeravus Ovares2008-03-02 19:48:26 +0000
commit9991955014a4a87269067517e23ad7a4c71c1866 (patch)
tree936e87a384954f7e2fc8a3b5b2a3cfa402185426
parent* Temporarily commented out the parcel banlist clearing query that was being ... (diff)
downloadopensim-SC_OLD-9991955014a4a87269067517e23ad7a4c71c1866.zip
opensim-SC_OLD-9991955014a4a87269067517e23ad7a4c71c1866.tar.gz
opensim-SC_OLD-9991955014a4a87269067517e23ad7a4c71c1866.tar.bz2
opensim-SC_OLD-9991955014a4a87269067517e23ad7a4c71c1866.tar.xz
Applying Ahzzmandius' second patch from bug 701.
ClientView triggers OnClose event before flushing packetqueue. Thank sAhzzmandius!
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs1
-rw-r--r--OpenSim/Region/ClientStack/PacketQueue.cs2
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
384 { 384 {
385 // Pull Client out of Region 385 // Pull Client out of Region
386 m_log.Info("[CLIENT]: Close has been called"); 386 m_log.Info("[CLIENT]: Close has been called");
387 m_packetQueue.Flush();
387 388
388 //raiseevent on the packet server to Shutdown the circuit 389 //raiseevent on the packet server to Shutdown the circuit
389 if (shutdownCircuit) 390 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
182 return SendQueue.Dequeue(); 182 return SendQueue.Dequeue();
183 } 183 }
184 184
185 private void Flush() 185 public void Flush()
186 { 186 {
187 lock (this) 187 lock (this)
188 { 188 {