mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 11:33:28 +08:00
Merge branch 'master' into careminster-presence-refactor
This commit is contained in:
@@ -155,10 +155,6 @@
|
||||
; it may cause unexpected physics problems.
|
||||
;UseMeshiesPhysicsMesh = false
|
||||
|
||||
; enable / disable Collada mesh support
|
||||
; default is true
|
||||
; ColladaMesh = true
|
||||
|
||||
; Choose one of the physics engines below
|
||||
; OpenDynamicsEngine is by some distance the most developed physics engine
|
||||
; basicphysics effectively does not model physics at all, making all objects phantom
|
||||
@@ -460,6 +456,12 @@
|
||||
CoalesceMultipleObjectsToInventory = true
|
||||
|
||||
|
||||
[Mesh]
|
||||
; enable / disable Collada mesh support
|
||||
; default is true
|
||||
ColladaMesh = true
|
||||
|
||||
|
||||
[ODEPhysicsSettings]
|
||||
;##
|
||||
;## World Settings
|
||||
|
||||
Reference in New Issue
Block a user