aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2012-12-26 01:16:08 +0000
committerMelanie2012-12-26 01:16:08 +0000
commit258588d5b5ad4757a793da238a3cc674656ee886 (patch)
tree218d854f02254892bc2ecda2fa9a6541f1986883 /bin/OpenSim.ini.example
parentRevert "Whitespace change to trigger ircbot" (diff)
parentBulletSim: Rename some of the interface structures (BulletWorld, ...) (diff)
downloadopensim-SC_OLD-258588d5b5ad4757a793da238a3cc674656ee886.zip
opensim-SC_OLD-258588d5b5ad4757a793da238a3cc674656ee886.tar.gz
opensim-SC_OLD-258588d5b5ad4757a793da238a3cc674656ee886.tar.bz2
opensim-SC_OLD-258588d5b5ad4757a793da238a3cc674656ee886.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6757081..f3e4f6c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -206,12 +206,13 @@
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} OpenDynamicsEngine
208 ;; OpenDynamicsEngine is by some distance the most developed physics engine 208 ;; OpenDynamicsEngine is by some distance the most developed physics engine
209 ;; BulletSim is incomplete and experimental but in active development 209 ;; BulletSim is incomplete and experimental but in active development. BulletSimN is a purely C# version of BulletSim.
210 ;; basicphysics effectively does not model physics at all, making all 210 ;; basicphysics effectively does not model physics at all, making all
211 ;; objects phantom 211 ;; objects phantom.
212 ;; Default is OpenDynamicsEngine 212 ;; Default is OpenDynamicsEngine
213 ; physics = OpenDynamicsEngine 213 ; physics = OpenDynamicsEngine
214 ; physics = BulletSim 214 ; physics = BulletSim
215 ; physics = BulletSimN
215 ; physics = basicphysics 216 ; physics = basicphysics
216 ; physics = POS 217 ; physics = POS
217 218