aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-06 17:28:21 +0100
committerJustin Clark-Casey (justincc)2014-05-06 17:28:21 +0100
commit539165e6bd87b3a4cc76b5a730abb88017bff555 (patch)
tree3b5cae3712d70ff1c859a2c40fb90f9df3070264
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.zip
opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.gz
opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.bz2
opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.xz
minor: Change configuration text in config files to reflect the existing situation of BulletSim as the default physics engine.
-rw-r--r--bin/OpenSim.ini.example11
-rw-r--r--bin/OpenSimDefaults.ini9
2 files changed, 12 insertions, 8 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8742313..7f2cba6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -204,11 +204,12 @@
204 ; meshing = ZeroMesher 204 ; meshing = ZeroMesher
205 205
206 ;; Choose one of the physics engines below 206 ;; Choose one of the physics engines below
207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine 207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
208 ;; OpenDynamicsEngine is by some distance the most developed physics engine 208 ;; BulletSim is the default physics engine. It provides the best performance and most functionality.
209 ;; BulletSim is experimental and in active development. 209 ;; BulletSim supports varregions.
210 ;; basicphysics effectively does not model physics at all, making all 210 ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before.
211 ;; objects phantom. 211 ;; It continues to provide a workable physics implementation. It does not currently support varregions.
212 ;; basicphysics effectively does not model physics at all, making all objects phantom.
212 ;; Default is OpenDynamicsEngine 213 ;; Default is OpenDynamicsEngine
213 ; physics = OpenDynamicsEngine 214 ; physics = OpenDynamicsEngine
214 ; physics = BulletSim 215 ; physics = BulletSim
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index df332ca..cae2958 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -234,9 +234,12 @@
234 ; to false if you have compatibility problems. 234 ; to false if you have compatibility problems.
235 ;CacheSculptMaps = true 235 ;CacheSculptMaps = true
236 236
237 ; Choose one of the physics engines below. 237 ;; BulletSim is the default physics engine. It provides the best performance and most functionality.
238 ; BulletSim is a high performance physics engine. It is the default OpenSimulator physics engine 238 ;; BulletSim supports varregions.
239 ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before 239 ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before.
240 ;; It continues to provide a workable physics implementation. It does not currently support varregions.
241 ;; basicphysics effectively does not model physics at all, making all objects phantom.
242 ;; Default is OpenDynamicsEngine
240 physics = BulletSim 243 physics = BulletSim
241 ;physics = modified_BulletX 244 ;physics = modified_BulletX
242 ;physics = OpenDynamicsEngine 245 ;physics = OpenDynamicsEngine