aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2012-08-16 02:46:48 +0100
committerMelanie2012-08-16 02:46:48 +0100
commit90ad98370aead53e886832a83a3e8793f361426e (patch)
treeb7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /bin
parentRemove AreUpdatesSuspended flag because it does nothing (diff)
parentDo a proper null check to avoid the overloaded operator == trap (diff)
downloadopensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.zip
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.gz
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini29
-rwxr-xr-xbin/lib32/BulletSim.dllbin534016 -> 550400 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2345796 -> 2387345 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin685056 -> 706048 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2551398 -> 2599320 bytes
5 files changed, 17 insertions, 12 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2571669..554aafa 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -894,7 +894,7 @@
894 AvatarDensity = 60.0 894 AvatarDensity = 60.0
895 AvatarCapsuleRadius = 0.37 895 AvatarCapsuleRadius = 0.37
896 AvatarCapsuleHeight = 1.5 896 AvatarCapsuleHeight = 1.5
897 AvatarContactProcessingThreshold = 0.1; 897 AvatarContactProcessingThreshold = 0.1
898 898
899 MaxObjectMass = 10000.01 899 MaxObjectMass = 10000.01
900 900
@@ -908,19 +908,19 @@
908 CcdSweptSphereRadius = 0.0 908 CcdSweptSphereRadius = 0.0
909 ContactProcessingThreshold = 0.1 909 ContactProcessingThreshold = 0.1
910 ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc) 910 ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
911 MaxPersistantManifoldPoolSize = 0; 911 MaxPersistantManifoldPoolSize = 0
912 ShouldDisableContactPoolDynamicAllocation = False; 912 ShouldDisableContactPoolDynamicAllocation = False
913 ShouldForceUpdateAllAabbs = False; 913 ShouldForceUpdateAllAabbs = False
914 ShouldRandomizeSolverOrder = False; 914 ShouldRandomizeSolverOrder = False
915 ShouldSplitSimulationIslands = False; 915 ShouldSplitSimulationIslands = False
916 ShouldEnableFrictionCaching = False; 916 ShouldEnableFrictionCaching = False
917 NumberOfSolverIterations = 0; 917 NumberOfSolverIterations = 0;
918 918
919 ; Linkset constraint parameters 919 ; Linkset constraint parameters
920 LinkConstraintUseFrameOffset = False; 920 LinkConstraintUseFrameOffset = False
921 LinkConstraintEnableTransMotor = True; 921 LinkConstraintEnableTransMotor = True
922 LinkConstraintTransMotorMaxVel = 5.0; 922 LinkConstraintTransMotorMaxVel = 5.0
923 LinkConstraintTransMotorMaxForce = 0.1; 923 LinkConstraintTransMotorMaxForce = 0.1
924 924
925 925
926 ; Whether to mesh sculpties 926 ; Whether to mesh sculpties
@@ -935,12 +935,17 @@
935 SculptLevelOfDetail = 32 935 SculptLevelOfDetail = 32
936 936
937 ; Bullet step parameters 937 ; Bullet step parameters
938 MaxSubSteps = 10; 938 MaxSubSteps = 10
939 FixedTimeStep = .01667 939 FixedTimeStep = .01667
940 940
941 MaxCollisionsPerFrame = 2048 941 MaxCollisionsPerFrame = 2048
942 MaxUpdatesPerFrame = 8192 942 MaxUpdatesPerFrame = 8192
943 943
944 ; Detailed physics debug logging
945 PhysicsLoggingEnabled = False
946 PhysicsLoggingDir = "."
947 VehicleLoggingEnabled = False
948
944[RemoteAdmin] 949[RemoteAdmin]
945 enabled = false 950 enabled = false
946 951
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index f4953f9..0f2d522 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 2b5702d..783c9a2 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 be191c0..c2a2bda 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 fc51b39..74d4f98 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ