Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-02-07 23:30:48 +00:00
14 changed files with 145 additions and 111 deletions

View File

@@ -637,13 +637,12 @@
[Mesh]
; enable / disable Collada mesh support
; default is true
; AllowMeshUpload = true
AllowMeshUpload = true
; if you use Meshmerizer and want collisions for meshies, setting this to true
; will cause OpenSim to attempt to decode meshies assets, extract the physics
; mesh, and use it for collisions. This is currently experimental code and enabling
; it may cause unexpected physics problems.
;UseMeshiesPhysicsMesh = false
; mesh, and use it for collisions.
UseMeshiesPhysicsMesh = true
[ODEPhysicsSettings]