aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorRobert Adams2012-07-26 14:54:57 -0700
committerRobert Adams2012-07-26 16:05:57 -0700
commit7d30637d51c64a582cc55d41546af8f0cfc889ba (patch)
tree50b9899f149f434bed037be91983b4b0453782b7 /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7d30637d51c64a582cc55d41546af8f0cfc889ba.zip
opensim-SC_OLD-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.gz
opensim-SC_OLD-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.bz2
opensim-SC_OLD-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.xz
BulletSim: refactor all the linkset logic out of the prim class
and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5935ca1..f92c555 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -915,7 +915,7 @@
915 NumberOfSolverIterations = 0; 915 NumberOfSolverIterations = 0;
916 916
917 ; Linkset constraint parameters 917 ; Linkset constraint parameters
918 LinkConstraintUseFrameOffset = True; 918 LinkConstraintUseFrameOffset = False;
919 LinkConstraintEnableTransMotor = True; 919 LinkConstraintEnableTransMotor = True;
920 LinkConstraintTransMotorMaxVel = 5.0; 920 LinkConstraintTransMotorMaxVel = 5.0;
921 LinkConstraintTransMotorMaxForce = 0.1; 921 LinkConstraintTransMotorMaxForce = 0.1;
@@ -937,7 +937,7 @@
937 FixedTimeStep = .01667 937 FixedTimeStep = .01667
938 938
939 MaxCollisionsPerFrame = 2048 939 MaxCollisionsPerFrame = 2048
940 MaxUpdatesPerFrame = 2048 940 MaxUpdatesPerFrame = 8192
941 941
942[RemoteAdmin] 942[RemoteAdmin]
943 enabled = false 943 enabled = false