aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey2009-08-04 19:01:01 +0100
committerJustin Clark-Casey2009-08-04 19:01:01 +0100
commitbfc705766bf88d34223f26623318a84dc0c04657 (patch)
tree70f21ac111bdd6cf689a11df95e461a3c581a2ae /OpenSim/Region
parent* Small commented out debug message for module loading, partly to test my abi... (diff)
parenttrying to fix rare timer related exception. (diff)
downloadopensim-SC_OLD-bfc705766bf88d34223f26623318a84dc0c04657.zip
opensim-SC_OLD-bfc705766bf88d34223f26623318a84dc0c04657.tar.gz
opensim-SC_OLD-bfc705766bf88d34223f26623318a84dc0c04657.tar.bz2
opensim-SC_OLD-bfc705766bf88d34223f26623318a84dc0c04657.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e532939..9142b36 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -592,11 +592,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
592 Thread.Sleep(2000); 592 Thread.Sleep(2000);
593 593
594 // Shut down timers 594 // Shut down timers
595 m_clientPingTimer.Stop(); 595 if (m_clientPingTimer.Enabled) m_clientPingTimer.Stop();
596 m_avatarTerseUpdateTimer.Stop(); 596 if (m_avatarTerseUpdateTimer.Enabled) m_avatarTerseUpdateTimer.Stop();
597 m_primTerseUpdateTimer.Stop(); 597 if (m_primTerseUpdateTimer.Enabled) m_primTerseUpdateTimer.Stop();
598 m_primFullUpdateTimer.Stop(); 598 if (m_primFullUpdateTimer.Enabled) m_primFullUpdateTimer.Stop();
599 m_textureRequestTimer.Stop(); 599 if (m_textureRequestTimer.Enabled) m_textureRequestTimer.Stop();
600 600
601 // This is just to give the client a reasonable chance of 601 // This is just to give the client a reasonable chance of
602 // flushing out all it's packets. There should probably 602 // flushing out all it's packets. There should probably
@@ -676,11 +676,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
676 public void Stop() 676 public void Stop()
677 { 677 {
678 // Shut down timers 678 // Shut down timers
679 m_clientPingTimer.Stop(); 679 if (m_clientPingTimer.Enabled) m_clientPingTimer.Stop();
680 m_avatarTerseUpdateTimer.Stop(); 680 if (m_avatarTerseUpdateTimer.Enabled) m_avatarTerseUpdateTimer.Stop();
681 m_primTerseUpdateTimer.Stop(); 681 if (m_primTerseUpdateTimer.Enabled) m_primTerseUpdateTimer.Stop();
682 m_primFullUpdateTimer.Stop(); 682 if (m_primFullUpdateTimer.Enabled) m_primFullUpdateTimer.Stop();
683 m_textureRequestTimer.Stop(); 683 if (m_textureRequestTimer.Enabled) m_textureRequestTimer.Stop();
684 } 684 }
685 685
686 public void Restart() 686 public void Restart()
@@ -3111,7 +3111,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3111 { 3111 {
3112 lock (m_primFullUpdates) 3112 lock (m_primFullUpdates)
3113 { 3113 {
3114 if (m_primFullUpdates.Count == 0) 3114 if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
3115 { 3115 {
3116 m_primFullUpdateTimer.Stop(); 3116 m_primFullUpdateTimer.Stop();
3117 3117
@@ -3159,7 +3159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3159 outPacket.Header.Zerocoded = true; 3159 outPacket.Header.Zerocoded = true;
3160 OutPacket(outPacket, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority); 3160 OutPacket(outPacket, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
3161 3161
3162 if (m_primFullUpdates.Count == 0) 3162 if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
3163 m_primFullUpdateTimer.Stop(); 3163 m_primFullUpdateTimer.Stop();
3164 } 3164 }
3165 } 3165 }