diff options
| author | Melanie | 2012-08-03 16:48:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:48:06 +0100 |
| commit | eb4c092cac88869c02f9d857753bb92c34ab044c (patch) | |
| tree | 2766a3a537a82968f16a4e6259028b8969092fac /bin | |
| parent | Make WaitGetScenePresence wait for up to 20 seconds (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.zip opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.gz opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.bz2 opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.xz | |
Merge branch 'careminster' into avination
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 532480 -> 533504 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2321137 -> 2340496 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 683008 -> 684032 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2516576 -> 2540931 bytes |
5 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 80d17d9..ced0bce 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -937,7 +937,7 @@ | |||
| 937 | FixedTimeStep = .01667 | 937 | FixedTimeStep = .01667 |
| 938 | 938 | ||
| 939 | MaxCollisionsPerFrame = 2048 | 939 | MaxCollisionsPerFrame = 2048 |
| 940 | MaxUpdatesPerFrame = 8192 | 940 | MaxUpdatesPerFrame = 2048 |
| 941 | 941 | ||
| 942 | [RemoteAdmin] | 942 | [RemoteAdmin] |
| 943 | enabled = false | 943 | enabled = false |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index fd8f39a..03e8f26 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 72847e7..4e119c4 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 300e4be..6e8d6b4 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 1acc0dd..9363d1a 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||