From 5f4c2eb5e658f70344ca92cf09686b6e45bb572e Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 4 Sep 2014 18:24:59 +0100
Subject: [PATCH] Make LLUDP output queue refill thread active by default,
 since load tests have shown that this has better scalability.

For testing, previous behaviour can be restored with the console command "debug lludp oqre stop" at runtime.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs            | 2 ++
 .../Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 87aa37dad1..e879e7636f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -447,6 +447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             StartInbound();
             StartOutbound();
+            OqrEngine.Start();
 
             m_elapsedMSSinceLastStatReport = Environment.TickCount;
         }
@@ -491,6 +492,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name);
             base.StopOutbound();
             base.StopInbound();
+            OqrEngine.Stop();
         }
 
         protected override bool EnablePools()
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
index 0659d8e47e..069c9c8162 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "debug lludp oqre",
                 "debug lludp oqre <start|stop|status>",
                 "Start, stop or get status of OutgoingQueueRefillEngine.",
-                "Experimental.",
+                "If stopped then refill requests are processed directly via the threadpool.",
                 HandleOqreCommand);
         }