aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorJeff Ames2008-09-09 01:26:48 +0000
committerJeff Ames2008-09-09 01:26:48 +0000
commitfae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch)
tree2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentFix state xxx within state xxx itself triggering a state "change" to (diff)
downloadopensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 356dee8..3c860a9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
115 protected UUID m_activeGroupID = UUID.Zero; 115 protected UUID m_activeGroupID = UUID.Zero;
116 protected string m_activeGroupName = String.Empty; 116 protected string m_activeGroupName = String.Empty;
117 protected ulong m_activeGroupPowers = 0; 117 protected ulong m_activeGroupPowers = 0;
118 protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>(); 118 protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>();
119 119
120 /* Instantiated Designated Event Delegates */ 120 /* Instantiated Designated Event Delegates */
121 //- used so we don't create new objects for each incoming packet and then toss it out later */ 121 //- used so we don't create new objects for each incoming packet and then toss it out later */
@@ -302,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
302 get { return m_activeGroupPowers; } 302 get { return m_activeGroupPowers; }
303 } 303 }
304 304
305 public ulong GetGroupPowers(UUID groupID) 305 public ulong GetGroupPowers(UUID groupID)
306 { 306 {
307 if (m_groupPowers.ContainsKey(groupID)) 307 if (m_groupPowers.ContainsKey(groupID))
308 return m_groupPowers[groupID]; 308 return m_groupPowers[groupID];
@@ -645,7 +645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
645 protected virtual void ClientLoop() 645 protected virtual void ClientLoop()
646 { 646 {
647 m_log.Info("[CLIENT]: Entered main packet processing loop"); 647 m_log.Info("[CLIENT]: Entered main packet processing loop");
648 648
649 while (true) 649 while (true)
650 { 650 {
651 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); 651 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
@@ -683,10 +683,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
683 if (m_PacketHandler.PacketsReceived == m_inPacketsChecked) 683 if (m_PacketHandler.PacketsReceived == m_inPacketsChecked)
684 { 684 {
685 // no packet came in since the last time we checked... 685 // no packet came in since the last time we checked...
686 686
687 m_probesWithNoIngressPackets++; 687 m_probesWithNoIngressPackets++;
688 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active 688 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active
689 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused 689 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused
690 { 690 {
691 m_clientPingTimer.Enabled = false; 691 m_clientPingTimer.Enabled = false;
692 692
@@ -709,7 +709,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
709 { 709 {
710 // Something received in the meantime - we can reset the counters 710 // Something received in the meantime - we can reset the counters
711 m_probesWithNoIngressPackets = 0; 711 m_probesWithNoIngressPackets = 0;
712 // ... and store the current number of packets received to find out if another one got in on the next cycle 712 // ... and store the current number of packets received to find out if another one got in on the next cycle
713 m_inPacketsChecked = m_PacketHandler.PacketsReceived; 713 m_inPacketsChecked = m_PacketHandler.PacketsReceived;
714 } 714 }
715 715
@@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
749 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); 749 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code);
750 AuthenticateResponse sessionInfo = 750 AuthenticateResponse sessionInfo =
751 m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode); 751 m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode);
752 752
753 if (!sessionInfo.Authorised) 753 if (!sessionInfo.Authorised)
754 { 754 {
755 //session/circuit not authorised 755 //session/circuit not authorised