diff options
| author | Diva Canto | 2012-03-27 10:09:08 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-27 10:09:08 -0700 |
| commit | 2e2634896d22ee08b0d3fae40f0a8c933190f556 (patch) | |
| tree | 0d506518180b3892026bff6e0b9b5d00e1894e74 /bin | |
| parent | Send the config section name up to the service classes themselves (XInventory... (diff) | |
| parent | Add Garmin Kawaguichi to CONTRIBUTORS.txt (diff) | |
| download | opensim-SC-2e2634896d22ee08b0d3fae40f0a8c933190f556.zip opensim-SC-2e2634896d22ee08b0d3fae40f0a8c933190f556.tar.gz opensim-SC-2e2634896d22ee08b0d3fae40f0a8c933190f556.tar.bz2 opensim-SC-2e2634896d22ee08b0d3fae40f0a8c933190f556.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 533504 -> 533504 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 619149 -> 619145 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 685056 -> 686080 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 688874 -> 688866 bytes |
5 files changed, 2 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 41be415..28c5587 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -864,8 +864,9 @@ | |||
| 864 | CcdMotionThreshold = 0.0 | 864 | CcdMotionThreshold = 0.0 |
| 865 | CcdSweptSphereRadius = 0.0 | 865 | CcdSweptSphereRadius = 0.0 |
| 866 | ContactProcessingThreshold = 0.1 | 866 | ContactProcessingThreshold = 0.1 |
| 867 | ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc) | ||
| 867 | MaxPersistantManifoldPoolSize = 0; | 868 | MaxPersistantManifoldPoolSize = 0; |
| 868 | ShouldDisableContactPoolDynamicAllocation = True; | 869 | ShouldDisableContactPoolDynamicAllocation = False; |
| 869 | ShouldForceUpdateAllAabbs = False; | 870 | ShouldForceUpdateAllAabbs = False; |
| 870 | ShouldRandomizeSolverOrder = False; | 871 | ShouldRandomizeSolverOrder = False; |
| 871 | ShouldSplitSimulationIslands = False; | 872 | ShouldSplitSimulationIslands = False; |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 357f26e..5bef6e9 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 948d8e3..9882f5b 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 db8530c..9f09ef8 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 b2fd9d2..fa47bf1 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||