aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-18 21:14:38 +0000
committerJustin Clarke Casey2008-08-18 21:14:38 +0000
commit9650632cd125fa6e5c804f76ecdfac9904e8581b (patch)
treeb8ad66f6a436ef2e755d5d29448f31ce5c748b69 /OpenSim/Region/ClientStack/LindenUDP
parent* osmantis test. Speak, we want you to. (diff)
downloadopensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.zip
opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.gz
opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.bz2
opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.xz
* It appears that sometimes some IClientAPI reference is not being released, resulting in continual execution of the CheckConnectivity timer method
* For now, just turn off this timer when we close the connection * Also some minor help refactoring creeps in to this revision.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8f0e2d7..ef66e93 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -456,6 +456,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
456 /// <param name="shutdownCircuit"></param> 456 /// <param name="shutdownCircuit"></param>
457 public void Close(bool shutdownCircuit) 457 public void Close(bool shutdownCircuit)
458 { 458 {
459 m_clientPingTimer.Enabled = false;
460
459 m_log.DebugFormat( 461 m_log.DebugFormat(
460 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}", 462 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}",
461 shutdownCircuit, m_scene.RegionInfo.RegionName); 463 shutdownCircuit, m_scene.RegionInfo.RegionName);
@@ -655,14 +657,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
655 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) 657 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked)
656 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) 658 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked))
657 { 659 {
660 m_clientPingTimer.Enabled = false;
661
662 m_log.WarnFormat(
663 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection",
664 Name, AgentId);
665
658 if (OnConnectionClosed != null) 666 if (OnConnectionClosed != null)
659 { 667 {
660 m_log.WarnFormat(
661 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection",
662 Name, AgentId);
663
664 OnConnectionClosed(this); 668 OnConnectionClosed(this);
665 } 669 }
666 } 670 }
667 else 671 else
668 { 672 {