From 1d33a40f59fc15bd85004cc68e802a0b274dad30 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 6 Oct 2014 23:29:41 +0100 Subject: Add "debug lludp set scene-throttle-max " console command to allow us to potentially set the scene max throttle on the fly. --- OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs') diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 9dfe0e9..8ca0b1f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs @@ -243,15 +243,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// Incoming packets that are awaiting handling private OpenMetaverse.BlockingQueue packetInbox = new OpenMetaverse.BlockingQueue(); - /// - //private UDPClientCollection m_clients = new UDPClientCollection(); /// Bandwidth throttle for this UDP server - protected TokenBucket m_throttle; + public TokenBucket Throttle { get; private set; } /// /// Gets the maximum total drip rate allowed to all clients. /// - public long MaxTotalDripRate { get { return m_throttle.RequestedDripRate; } } + public long MaxTotalDripRate { get { return Throttle.RequestedDripRate; } } /// Bandwidth throttle rates for this UDP server public ThrottleRates ThrottleRates { get; private set; } @@ -449,7 +447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // = new TokenBucket( // string.Format("server throttle bucket for {0}", Scene.Name), null, sceneThrottleBps); - m_throttle = new TokenBucket("server throttle bucket", null, sceneThrottleBps); + Throttle = new TokenBucket("server throttle bucket", null, sceneThrottleBps); ThrottleRates = new ThrottleRates(configSource); @@ -1761,7 +1759,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { if (!Scene.TryGetClient(agentID, out client)) { - LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); + LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, Throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); client = new LLClientView(Scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); client.OnLogout += LogoutHandler; -- cgit v1.1