diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 6f82f23ed9..dbf67c4724 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -248,17 +248,12 @@ ;; Default is Meshmerizer ; meshing = Meshmerizer ; meshing = ZeroMesher - ;; Must select ubODEMeshmerizer with ubOde physics engine + ;; With ubOde physics engine you must select ubODEMeshmerizer ; meshing = ubODEMeshmerizer ;; Choose one of the physics engines below ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} ubODE - ;; BulletSim is the default physics engine. It provides the best performance and most functionality. - ;; BulletSim supports varregions. - ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before. - ;; It continues to provide a workable physics implementation. It does not currently support varregions. - ;; basicphysics effectively does not model physics at all, making all objects phantom. - ;; Default is BulletSim + ;; Default is ubODE ; physics = BulletSim ; physics = basicphysics ; physics = POS diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4ae8debdbb..1526604506 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -264,14 +264,13 @@ ; If false then physics flag can be set but it is not honoured. However, prims are still solid for the purposes of collision direction physical_prim = true - ; Select a mesher here. + ; Select a mesher for physics here. + ; This the code that defines the shapes the physics engines will use for collisons + ; based on prims data ; - ; - ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports - ; Usually this is only a box or a sphere ; meshing = ubODEMeshmerizer ; meshing = Meshmerizer - ;meshing = ZeroMesher + ; meshing = ZeroMesher ;; Must select ubODEMeshmerizer with ubOde physics engine meshing = ubODEMeshmerizer @@ -286,16 +285,11 @@ ; to false if you have compatibility problems. ;CacheSculptMaps = true - ;; BulletSim is the default physics engine. It provides the best performance and most functionality. - ;; BulletSim supports varregions. - ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before. - ;; It continues to provide a workable physics implementation. It does not currently support varregions. - ;; basicphysics effectively does not model physics at all, making all objects phantom. - ;; Default is BulletSim + ; Select the physics simulation engine ; physics = BulletSim - ;physics = modified_BulletX - ;physics = basicphysics - ;physics = POS + ; physics = modified_BulletX + ; physics = basicphysics + ; physics = POS physics = ubODE ; ##