Merge branch 'master' into mantis5110

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5ced7d5..de7c44c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -328,8 +328,9 @@
     ; already separated from packet handling with a queue, so this will only
     ; affect whether networking internals such as packet decoding and
     ; acknowledgement accounting are done synchronously or asynchronously
+    ; Default is true.
     ;
-    ;async_packet_handling = false
+    ;async_packet_handling = true
 
     ; The client socket receive buffer size determines how many
     ; incoming requests we can process; the default on .NET is 8192