diff options
| author | Diva Canto | 2012-10-04 15:33:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-10-04 15:33:17 -0700 |
| commit | 276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d (patch) | |
| tree | 5ffb03205018d07a7d0590e8c1d0766b1cc2fbaf /bin | |
| parent | One more abstraction for GridUser so that it can be overridden in a sub-class. (diff) | |
| parent | Make the asset retrieval concurrency a config switch. The current value (diff) | |
| download | opensim-SC_OLD-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.zip opensim-SC_OLD-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.gz opensim-SC_OLD-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.bz2 opensim-SC_OLD-276fdbc1b3d1001ddb32b5f5f82db0fdf1e39f7d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 582144 -> 582144 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2692621 -> 2692621 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 747008 -> 747008 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2950520 -> 2950520 bytes |
5 files changed, 4 insertions, 0 deletions
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 @@ | |||
| 427 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 427 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
| 428 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 428 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
| 429 | 429 | ||
| 430 | ; OpenSim can send multiple simultaneous requests for services such as asset | ||
| 431 | ; retrieval. However, some versions of mono appear to hang when there are too | ||
| 432 | ; many simultaneous requests, default is 30 and is currently applied only to assets | ||
| 433 | ;MaxRequestConcurrency = 30 | ||
| 430 | 434 | ||
| 431 | [XMLRPC] | 435 | [XMLRPC] |
| 432 | ; ## | 436 | ; ## |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index da6e31c..1fd0a60 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 9503cdb..3b42048 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 1782c8e..bfaabde 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 06e6ce2..54ddad9 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||