diff options
| author | Melanie | 2012-11-22 03:17:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 03:17:33 +0000 |
| commit | c4c612175271d146f4afe133cdb42ca430df445b (patch) | |
| tree | 3b49ec8e0d8e2cfe2c514b620f34d941bfba5f3e /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If an asset POST does not contain well-formed XML, return a 400 (Bad Request)... (diff) | |
| download | opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.zip opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.gz opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.bz2 opensim-SC_OLD-c4c612175271d146f4afe133cdb42ca430df445b.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 551424 -> 551424 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1707213 -> 1707321 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 699904 -> 699904 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1844124 -> 1844228 bytes |
5 files changed, 2 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 01ba5b9..54f252e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -909,7 +909,8 @@ | |||
| 909 | AvatarFriction = 0.2 | 909 | AvatarFriction = 0.2 |
| 910 | AvatarRestitution = 0.0 | 910 | AvatarRestitution = 0.0 |
| 911 | AvatarDensity = 60.0 | 911 | AvatarDensity = 60.0 |
| 912 | AvatarCapsuleRadius = 0.37 | 912 | AvatarCapsuleWidth = 0.6 |
| 913 | AvatarCapsuleDepth = 0.45 | ||
| 913 | AvatarCapsuleHeight = 1.5 | 914 | AvatarCapsuleHeight = 1.5 |
| 914 | AvatarContactProcessingThreshold = 0.1 | 915 | AvatarContactProcessingThreshold = 0.1 |
| 915 | 916 | ||
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 9c8cf00..2ae1c75 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 0277cf1..d4852a5 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 5675ff3..77cf7e3 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 49396a8..4ec62b2 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||