diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 7a1e59b939..6f82f23ed9 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -241,18 +241,18 @@ ;; Select a mesher here. ;; - ;# {meshing} {} {Select mesher} {Meshmerizer ZeroMesher} Meshmerizer + ;# {meshing} {} {Select mesher} {Meshmerizer ZeroMesher} ubODEMeshmerizer ;; 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. + ;; Usually this is only a box or a sphere ;; Default is Meshmerizer ; meshing = Meshmerizer ; meshing = ZeroMesher - ;; select ubODEMeshmerizer only with ubOde physics engine + ;; Must select ubODEMeshmerizer with ubOde physics engine ; meshing = ubODEMeshmerizer ;; Choose one of the physics engines below - ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim + ;# {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. @@ -262,7 +262,6 @@ ; physics = BulletSim ; physics = basicphysics ; physics = POS - ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also ; physics = ubODE ; ubODE does allocate a lot of memory on stack. On linux you may need to increase its limit diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 065f6a0ba6..4ae8debdbb 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -268,13 +268,12 @@ ; ; ; 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 - ; select ubODEMeshmerizer with and only with ubOde physics engine + ; Usually this is only a box or a sphere ; meshing = ubODEMeshmerizer - meshing = Meshmerizer + ; meshing = Meshmerizer ;meshing = ZeroMesher - ;; select ubODEMeshmerizer only with ubOde physics engine - ; meshing = ubODEMeshmerizer + ;; Must select ubODEMeshmerizer with ubOde physics engine + meshing = ubODEMeshmerizer ; Path to decoded sculpty maps ; Defaults to "j2kDecodeCache @@ -293,11 +292,11 @@ ;; 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 - physics = BulletSim + ; physics = BulletSim ;physics = modified_BulletX ;physics = basicphysics ;physics = POS - ; physics = ubODE + physics = ubODE ; ## ; ## SCRIPT ENGINE