diff options
| author | Justin Clark-Casey (justincc) | 2012-07-26 23:46:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-26 23:46:54 +0100 |
| commit | 0aaf52fca43d0fed461b228dfad4b5d3f42da2b7 (patch) | |
| tree | 847a357593e5aa532c397d3886366e4c4922958f /bin | |
| parent | When copying items, copy the item description field instead of the asset desc... (diff) | |
| parent | BulletSim: update BulletSim DLLs and SOs (diff) | |
| download | opensim-SC_OLD-0aaf52fca43d0fed461b228dfad4b5d3f42da2b7.zip opensim-SC_OLD-0aaf52fca43d0fed461b228dfad4b5d3f42da2b7.tar.gz opensim-SC_OLD-0aaf52fca43d0fed461b228dfad4b5d3f42da2b7.tar.bz2 opensim-SC_OLD-0aaf52fca43d0fed461b228dfad4b5d3f42da2b7.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 | 540672 -> 541184 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2461336 -> 2469030 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 694272 -> 695296 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2669479 -> 2677809 bytes |
5 files changed, 6 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ededdc05..5935ca1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -914,6 +914,12 @@ | |||
| 914 | ShouldEnableFrictionCaching = False; | 914 | ShouldEnableFrictionCaching = False; |
| 915 | NumberOfSolverIterations = 0; | 915 | NumberOfSolverIterations = 0; |
| 916 | 916 | ||
| 917 | ; Linkset constraint parameters | ||
| 918 | LinkConstraintUseFrameOffset = True; | ||
| 919 | LinkConstraintEnableTransMotor = True; | ||
| 920 | LinkConstraintTransMotorMaxVel = 5.0; | ||
| 921 | LinkConstraintTransMotorMaxForce = 0.1; | ||
| 922 | |||
| 917 | 923 | ||
| 918 | ; Whether to mesh sculpties | 924 | ; Whether to mesh sculpties |
| 919 | MeshSculptedPrim = true | 925 | MeshSculptedPrim = true |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 322322a..c6bb76a 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 493c8cb..6ca98cc 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 2bd13b8..0924dd0 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 af3a078..70bcdb7 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||