Merge branch 'melanie_test' into prioritization

This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.

1 files changed, 4 insertions, 1 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 35b08f9..79d57d2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -39,7 +39,7 @@
     ; Sets the method that OpenSim will use to fire asynchronous
     ; events. Valid values are UnsafeQueueUserWorkItem,
     ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread
-    async_call_method = UnsafeQueueUserWorkItem
+    ; async_call_method = SmartThreadPool
 
     ; ##
     ; ## CLIENTS
@@ -51,6 +51,9 @@
     ; Set this to the DLL containing the client stack to use.
     clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
 
+    ; Max threads to allocate on the FireAndForget pool
+    MaxPoolThreads = 15
+
     ; ##
     ; ## REGIONS
     ; ##