diff options
| author | Melanie | 2012-08-11 17:32:30 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-11 17:32:30 +0100 |
| commit | 93e3ab3ebd81e4a8d588e49d5486903867cf0257 (patch) | |
| tree | 1f1389187afd43439b8274b16912c2fee5b654b6 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'bulletsim7' (diff) | |
| download | opensim-SC_OLD-93e3ab3ebd81e4a8d588e49d5486903867cf0257.zip opensim-SC_OLD-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.gz opensim-SC_OLD-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.bz2 opensim-SC_OLD-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 533504 -> 534016 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2342028 -> 2345796 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 684544 -> 685056 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2542786 -> 2551398 bytes |
5 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 45d5090..2571669 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -939,7 +939,7 @@ | |||
| 939 | FixedTimeStep = .01667 | 939 | FixedTimeStep = .01667 |
| 940 | 940 | ||
| 941 | MaxCollisionsPerFrame = 2048 | 941 | MaxCollisionsPerFrame = 2048 |
| 942 | MaxUpdatesPerFrame = 2048 | 942 | MaxUpdatesPerFrame = 8192 |
| 943 | 943 | ||
| 944 | [RemoteAdmin] | 944 | [RemoteAdmin] |
| 945 | enabled = false | 945 | enabled = false |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index ca1ee46..f4953f9 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 447e73b..2b5702d 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 6fc68ab..be191c0 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 7856358..fc51b39 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||