Merge branch 'master' into careminster-presence-refactor

1 files changed, 0 insertions, 7 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8d7c2cf..d660f36 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -37,13 +37,6 @@
     ; performance on .NET/Windows
     async_call_method = SmartThreadPool
 
-    ; There are several operations on large collections (such as
-    ; the current avatar list) that can be run synchronously or
-    ; in parallel. Running in parallel should increase performance
-    ; on a multi-core system, but will make debugging more
-    ; difficult if something deadlocks or times out
-    use_async_when_possible = false
-
     ; Max threads to allocate on the FireAndForget thread pool
     ; when running with the SmartThreadPool option above
     MaxPoolThreads = 15