aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJeff Ames2008-08-19 02:59:27 +0000
committerJeff Ames2008-08-19 02:59:27 +0000
commitbea7d4d81ad7a75706305be6c8ca06f8dc6e6eca (patch)
tree6350036021802eadb2540d14461eb545afd7dea6 /OpenSim/Region/ClientStack/LindenUDP
parentAttachment persistence!!! Patch #9169 (Mantis #1171) (diff)
downloadopensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.zip
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.gz
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.bz2
opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs2
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ef66e93..059255f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -457,7 +457,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
457 public void Close(bool shutdownCircuit) 457 public void Close(bool shutdownCircuit)
458 { 458 {
459 m_clientPingTimer.Enabled = false; 459 m_clientPingTimer.Enabled = false;
460 460
461 m_log.DebugFormat( 461 m_log.DebugFormat(
462 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}", 462 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}",
463 shutdownCircuit, m_scene.RegionInfo.RegionName); 463 shutdownCircuit, m_scene.RegionInfo.RegionName);
@@ -658,15 +658,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
658 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) 658 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked))
659 { 659 {
660 m_clientPingTimer.Enabled = false; 660 m_clientPingTimer.Enabled = false;
661 661
662 m_log.WarnFormat( 662 m_log.WarnFormat(
663 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection", 663 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection",
664 Name, AgentId); 664 Name, AgentId);
665 665
666 if (OnConnectionClosed != null) 666 if (OnConnectionClosed != null)
667 { 667 {
668 OnConnectionClosed(this); 668 OnConnectionClosed(this);
669 } 669 }
670 } 670 }
671 else 671 else
672 { 672 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 2775241..3071110 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
168 ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item); 168 ThrottleCheck(ref TextureThrottle, ref TextureOutgoingPacketQueue, item);
169 break; 169 break;
170 case ThrottleOutPacketType.Task: 170 case ThrottleOutPacketType.Task:
171 if((item.throttleType & ThrottleOutPacketType.LowPriority) != 0) 171 if ((item.throttleType & ThrottleOutPacketType.LowPriority) != 0)
172 ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item); 172 ThrottleCheck(ref TaskThrottle, ref TaskLowpriorityPacketQueue, item);
173 else 173 else
174 ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item); 174 ThrottleCheck(ref TaskThrottle, ref TaskOutgoingPacketQueue, item);