aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--bin/OpenSim.ini.example8
-rw-r--r--bin/OpenSimDefaults.ini.example9
2 files changed, 12 insertions, 5 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cab41f7..c44c033 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -244,7 +244,9 @@
244 ;; Default is Meshmerizer 244 ;; Default is Meshmerizer
245 ; meshing = Meshmerizer 245 ; meshing = Meshmerizer
246 ; meshing = ZeroMesher 246 ; meshing = ZeroMesher
247 247 ;; select ubODEMeshmerizer only with ubOde physics engine
248 ; meshing = ubODEMeshmerizer
249
248 ;; Choose one of the physics engines below 250 ;; Choose one of the physics engines below
249 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim 251 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
250 ;; BulletSim is the default physics engine. It provides the best performance and most functionality. 252 ;; BulletSim is the default physics engine. It provides the best performance and most functionality.
@@ -257,6 +259,9 @@
257 ; physics = BulletSim 259 ; physics = BulletSim
258 ; physics = basicphysics 260 ; physics = basicphysics
259 ; physics = POS 261 ; physics = POS
262 ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
263 ;; see also ODEPhysicsSettings section
264 ; physics = ubODE
260 265
261 ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine 266 ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
262 ;; Default script engine to use. Currently, we only have XEngine 267 ;; Default script engine to use. Currently, we only have XEngine
@@ -692,7 +697,6 @@
692 ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics) 697 ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
693 ; use_NINJA_physics_joints = false 698 ; use_NINJA_physics_joints = false
694 699
695
696[RemoteAdmin] 700[RemoteAdmin]
697 ;; This is the remote admin module, which uses XMLRPC requests to 701 ;; This is the remote admin module, which uses XMLRPC requests to
698 ;; manage regions from a web interface. 702 ;; manage regions from a web interface.
diff --git a/bin/OpenSimDefaults.ini.example b/bin/OpenSimDefaults.ini.example
index ef8f73a..fc9173e 100644
--- a/bin/OpenSimDefaults.ini.example
+++ b/bin/OpenSimDefaults.ini.example
@@ -135,7 +135,9 @@
135 135
136 meshing = Meshmerizer 136 meshing = Meshmerizer
137 ;meshing = ZeroMesher 137 ;meshing = ZeroMesher
138 138 ; select ubODEMeshmerizer only with ubOde physics engine
139 ; meshing = ubODEMeshmerizer
140
139 ; Choose one of the physics engines below 141 ; Choose one of the physics engines below
140 ; OpenDynamicsEngine is by some distance the most developed physics engine 142 ; OpenDynamicsEngine is by some distance the most developed physics engine
141 ; basicphysics effectively does not model physics at all, making all objects phantom 143 ; basicphysics effectively does not model physics at all, making all objects phantom
@@ -144,7 +146,8 @@
144 ;physics = basicphysics 146 ;physics = basicphysics
145 ;physics = POS 147 ;physics = POS
146 ;physics = modified_BulletX 148 ;physics = modified_BulletX
147 149 ; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
150 ; physics = ubODE
148 ; ## 151 ; ##
149 ; ## PERMISSIONS 152 ; ## PERMISSIONS
150 ; ## 153 ; ##
@@ -501,7 +504,7 @@
501 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH); 504 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
502 ; av_density * AVvolume; 505 ; av_density * AVvolume;
503 av_density = 80 506 av_density = 80
504 507
505 ; use this value to cut 52% of the height the sim gives us 508 ; use this value to cut 52% of the height the sim gives us
506 av_height_fudge_factor = 0.52 509 av_height_fudge_factor = 0.52
507 510