Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-12-05 19:53:54 +00:00
18 changed files with 171 additions and 41 deletions

View File

@@ -91,7 +91,7 @@
; Maximum total size, and maximum size where a prim can be physical
NonPhysicalPrimMax = 256
PhysicalPrimMax = 10
PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
ClampPrimSize = false
; Region crossing
@@ -597,6 +597,9 @@
body_motor_joint_maxforce_tensor_linux = 5
body_motor_joint_maxforce_tensor_win = 5
; Maximum mass an object can be before it is clamped
maximum_mass_object = 10000.01
; ##
; ## Sculpted Prim settings
; ##