From a5b8359b8ed3b02fc412643134b3006e9c27f246 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 2 Oct 2012 17:01:02 -0700
Subject: BulletSim: fix crash on load that showed up on 32bit Linux.

---
 bin/lib32/BulletSim.dll   | Bin 582144 -> 582144 bytes
 bin/lib32/libBulletSim.so | Bin 2692621 -> 2692621 bytes
 bin/lib64/BulletSim.dll   | Bin 747008 -> 747008 bytes
 bin/lib64/libBulletSim.so | Bin 2950520 -> 2950520 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index da6e31c..1fd0a60 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 9503cdb..3b42048 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 1782c8e..bfaabde 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 06e6ce2..54ddad9 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From d98af79f7727fd5d3cd94537b5b4d514f54f5250 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Thu, 4 Oct 2012 08:41:06 -0700
Subject: Make the asset retrieval concurrency a config switch. The current
 value of 30 is still hanging badly on some mono versions. The switch defaults
 to 30 to preserve current behavior.

---
 bin/OpenSimDefaults.ini | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6e6a089..677ac74 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -427,6 +427,10 @@
     ; " (Mozilla Compatible)" to the text where there are problems with a web server
     ;user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+    ; OpenSim can send multiple simultaneous requests for services such as asset
+    ; retrieval. However, some versions of mono appear to hang when there are too
+    ; many simultaneous requests, default is 30 and is currently applied only to assets
+    ;MaxRequestConcurrency = 30
 
 [XMLRPC]
     ; ##
-- 
cgit v1.1