From fae34bb10cfa10702faf5c19d8c8517faa018cb5 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 9 Sep 2008 01:26:48 +0000 Subject: Update svn properties, formatting cleanup. --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 +++++++------- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/ClientStack') 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 protected UUID m_activeGroupID = UUID.Zero; protected string m_activeGroupName = String.Empty; protected ulong m_activeGroupPowers = 0; - protected Dictionary m_groupPowers = new Dictionary(); + protected Dictionary m_groupPowers = new Dictionary(); /* Instantiated Designated Event Delegates */ //- 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 get { return m_activeGroupPowers; } } - public ulong GetGroupPowers(UUID groupID) + public ulong GetGroupPowers(UUID groupID) { if (m_groupPowers.ContainsKey(groupID)) return m_groupPowers[groupID]; @@ -645,7 +645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual void ClientLoop() { m_log.Info("[CLIENT]: Entered main packet processing loop"); - + while (true) { LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); @@ -683,10 +683,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (m_PacketHandler.PacketsReceived == m_inPacketsChecked) { // no packet came in since the last time we checked... - + m_probesWithNoIngressPackets++; if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active - || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused + || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused { m_clientPingTimer.Enabled = false; @@ -709,7 +709,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Something received in the meantime - we can reset the counters m_probesWithNoIngressPackets = 0; - // ... and store the current number of packets received to find out if another one got in on the next cycle + // ... and store the current number of packets received to find out if another one got in on the next cycle m_inPacketsChecked = m_PacketHandler.PacketsReceived; } @@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); AuthenticateResponse sessionInfo = m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode); - + if (!sessionInfo.Authorised) { //session/circuit not authorised diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 206216e..52a74e7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -58,12 +58,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected byte[] RecvBuffer = new byte[4096]; protected byte[] ZeroBuffer = new byte[8192]; protected IPEndPoint ipeSender; - + /// /// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods /// protected EndPoint epSender; - + protected EndPoint epProxy; protected int proxyPortOffset; protected AsyncCallback ReceivedData; @@ -75,7 +75,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); protected IScene m_localScene; protected AssetCache m_assetCache; - + /// /// Manages authentication for agent circuits /// @@ -260,12 +260,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ret = clientCircuits.TryGetValue(epSender, out circuit); } - + if (ret) { //if so then send packet to the packetserver //m_log.DebugFormat("[UDPSERVER]: For endpoint {0} got packet {1}", epSender, packet.Type); - + m_packetServer.InPacket(circuit, packet); } else if (packet.Type == PacketType.UseCircuitCode) @@ -358,8 +358,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; - - m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); + + m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); lock (clientCircuits) { @@ -386,10 +386,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (!PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_circuitManager, epProxy)) m_log.ErrorFormat( - "[CLIENT]: A circuit already existed for agent {0}, circuit {1}", + "[CLIENT]: A circuit already existed for agent {0}, circuit {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); } - + PacketPool.Instance.ReturnPacket(packet); } -- cgit v1.1