diff options
| author | Justin Clark-Casey (justincc) | 2012-09-29 00:09:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-09-29 00:09:12 +0100 |
| commit | fae869c4ca0d75c217b0ba8744346e238f7be0c9 (patch) | |
| tree | dadf703ef6e2b7654779090ba0e4d20f6a8d5875 /bin | |
| parent | Extend attachment regression test to check for appropriate attach event firing. (diff) | |
| parent | testing for xml-rpc errors in git repo. (diff) | |
| download | opensim-SC-fae869c4ca0d75c217b0ba8744346e238f7be0c9.zip opensim-SC-fae869c4ca0d75c217b0ba8744346e238f7be0c9.tar.gz opensim-SC-fae869c4ca0d75c217b0ba8744346e238f7be0c9.tar.bz2 opensim-SC-fae869c4ca0d75c217b0ba8744346e238f7be0c9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 6 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 569856 -> 582144 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2510105 -> 2692621 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 731136 -> 747008 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2750288 -> 2950520 bytes |
5 files changed, 3 insertions, 3 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index bd83bee..6e6a089 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -936,10 +936,10 @@ | |||
| 936 | MaxPersistantManifoldPoolSize = 0 | 936 | MaxPersistantManifoldPoolSize = 0 |
| 937 | ShouldDisableContactPoolDynamicAllocation = False | 937 | ShouldDisableContactPoolDynamicAllocation = False |
| 938 | ShouldForceUpdateAllAabbs = False | 938 | ShouldForceUpdateAllAabbs = False |
| 939 | ShouldRandomizeSolverOrder = False | 939 | ShouldRandomizeSolverOrder = True |
| 940 | ShouldSplitSimulationIslands = False | 940 | ShouldSplitSimulationIslands = True |
| 941 | ShouldEnableFrictionCaching = False | 941 | ShouldEnableFrictionCaching = False |
| 942 | NumberOfSolverIterations = 0; | 942 | NumberOfSolverIterations = 0 |
| 943 | 943 | ||
| 944 | ; Linkset constraint parameters | 944 | ; Linkset constraint parameters |
| 945 | LinkConstraintUseFrameOffset = False | 945 | LinkConstraintUseFrameOffset = False |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 3b35a98..da6e31c 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 65eba37..9503cdb 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 f01655b..1782c8e 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 5302e29..06e6ce2 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||