From caf298cda3d3b45b27fe3dd8d6c0313d46691a71 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sat, 12 Sep 2015 21:46:40 +0100
Subject: [PATCH] add entries the the ini.example files for ubODE

---
 bin/OpenSim.ini.example         | 8 ++++++--
 bin/OpenSimDefaults.ini.example | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cab41f718f..c44c033da0 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -244,7 +244,9 @@
     ;; Default is Meshmerizer
     ; meshing = Meshmerizer
     ; meshing = ZeroMesher
-
+	;; select ubODEMeshmerizer only with ubOde physics engine
+    ; meshing = ubODEMeshmerizer
+	
     ;; Choose one of the physics engines below
     ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
     ;; BulletSim is the default physics engine.  It provides the best performance and most functionality.
@@ -257,6 +259,9 @@
     ; physics = BulletSim
     ; physics = basicphysics
     ; physics = POS
+	;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+	;; see also ODEPhysicsSettings section
+	; physics = ubODE
 
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use. Currently, we only have XEngine
@@ -692,7 +697,6 @@
     ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
     ; use_NINJA_physics_joints = false
 
-
 [RemoteAdmin]
     ;; This is the remote admin module, which uses XMLRPC requests to
     ;; manage regions from a web interface.
diff --git a/bin/OpenSimDefaults.ini.example b/bin/OpenSimDefaults.ini.example
index ef8f73a40e..fc9173ee29 100644
--- a/bin/OpenSimDefaults.ini.example
+++ b/bin/OpenSimDefaults.ini.example
@@ -135,7 +135,9 @@
 
     meshing = Meshmerizer
     ;meshing = ZeroMesher
-
+	; select ubODEMeshmerizer only with ubOde physics engine
+    ; meshing = ubODEMeshmerizer
+	
     ; 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
@@ -144,7 +146,8 @@
     ;physics = basicphysics
     ;physics = POS
     ;physics = modified_BulletX
-
+	; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+	; physics = ubODE
     ; ##
     ; ## PERMISSIONS
     ; ##
@@ -501,7 +504,7 @@
     ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
     ; av_density * AVvolume;
     av_density = 80
-
+	
     ; use this value to cut 52% of the height the sim gives us
     av_height_fudge_factor = 0.52