aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2012-11-30 01:19:08 +0000
committerMelanie2012-11-30 01:19:08 +0000
commitdaa1d99513546121592bcab64d2178a570cd250e (patch)
treeb45c14a2771cef6bfee8477aea2a84f6f25ed873 /bin
parentMerge branch 'avination' into careminster (diff)
parentBulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_B... (diff)
downloadopensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.zip
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.gz
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.bz2
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini33
-rwxr-xr-xbin/lib32/BulletSim.dllbin551424 -> 551424 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1707321 -> 1707601 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin699904 -> 699904 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1844228 -> 1844572 bytes
5 files changed, 12 insertions, 21 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3c4110b..d83896e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,10 +217,10 @@
217 ; to false if you have compatibility problems. 217 ; to false if you have compatibility problems.
218 ;CacheSculptMaps = true 218 ;CacheSculptMaps = true
219 219
220 ; Choose one of the physics engines below 220 ; Choose one of the physics engines below.
221 ; OpenDynamicsEngine is by some distance the most developed physics engine 221 ; OpenDynamicsEngine is by some distance the most developed physics engine.
222 ; basicphysics effectively does not model physics at all, making all objects phantom 222 ; BulletSim is a high performance, up-and-coming physics engine.
223 223 ; basicphysics effectively does not model physics at all, making all objects phantom.
224 physics = OpenDynamicsEngine 224 physics = OpenDynamicsEngine
225 ;physics = basicphysics 225 ;physics = basicphysics
226 ;physics = POS 226 ;physics = POS
@@ -904,15 +904,18 @@
904 904
905[BulletSim] 905[BulletSim]
906 ; World parameters 906 ; World parameters
907 DefaultFriction = 0.50 907 DefaultFriction = 0.20
908 DefaultDensity = 10.000006836 908 DefaultDensity = 10.000006836
909 DefaultRestitution = 0.0 909 DefaultRestitution = 0.0
910 Gravity = -9.80665 910 Gravity = -9.80665
911 911
912 TerrainFriction = 0.50 912 TerrainFriction = 0.30
913 TerrainHitFriction = 0.8 913 TerrainHitFraction = 0.8
914 TerrainRestitution = 0 914 TerrainRestitution = 0
915 TerrainCollisionMargin = 0.04
916
915 AvatarFriction = 0.2 917 AvatarFriction = 0.2
918 AvatarStandingFriction = 0.99
916 AvatarRestitution = 0.0 919 AvatarRestitution = 0.0
917 AvatarDensity = 60.0 920 AvatarDensity = 60.0
918 AvatarCapsuleWidth = 0.6 921 AvatarCapsuleWidth = 0.6
@@ -926,27 +929,15 @@
926 LinearDamping = 0.0 929 LinearDamping = 0.0
927 AngularDamping = 0.0 930 AngularDamping = 0.0
928 DeactivationTime = 0.2 931 DeactivationTime = 0.2
929 LinearSleepingThreshold = 0.8 932 CollisionMargin = 0.04
930 AngularSleepingThreshold = 1.0
931 CcdMotionThreshold = 0.0
932 CcdSweptSphereRadius = 0.0
933 ContactProcessingThreshold = 0.1
934 ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
935 MaxPersistantManifoldPoolSize = 0
936 ShouldDisableContactPoolDynamicAllocation = False
937 ShouldForceUpdateAllAabbs = False
938 ShouldRandomizeSolverOrder = True
939 ShouldSplitSimulationIslands = True
940 ShouldEnableFrictionCaching = False
941 NumberOfSolverIterations = 0
942 933
943 ; Linkset constraint parameters 934 ; Linkset constraint parameters
935 LinkImplementation = 1 ; 0=constraint, 1=compound
944 LinkConstraintUseFrameOffset = False 936 LinkConstraintUseFrameOffset = False
945 LinkConstraintEnableTransMotor = True 937 LinkConstraintEnableTransMotor = True
946 LinkConstraintTransMotorMaxVel = 5.0 938 LinkConstraintTransMotorMaxVel = 5.0
947 LinkConstraintTransMotorMaxForce = 0.1 939 LinkConstraintTransMotorMaxForce = 0.1
948 940
949
950 ; Whether to mesh sculpties 941 ; Whether to mesh sculpties
951 MeshSculptedPrim = true 942 MeshSculptedPrim = true
952 943
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 2ae1c75..3f5011a 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 d4852a5..46d40fe 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 77cf7e3..27a807c 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 4ec62b2..1e82b3d 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ