diff options
author | Melanie | 2013-03-11 19:09:49 +0000 |
---|---|---|
committer | Melanie | 2013-03-11 19:09:49 +0000 |
commit | 1e7c7fb77978d835278c5576e07c00b6720402a3 (patch) | |
tree | 8e36cac6925fcc355e48530981ecc69c053977d1 /bin | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Update comment about setting physics=BulletSimN as the C# Bullet (diff) | |
download | opensim-SC_OLD-1e7c7fb77978d835278c5576e07c00b6720402a3.zip opensim-SC_OLD-1e7c7fb77978d835278c5576e07c00b6720402a3.tar.gz opensim-SC_OLD-1e7c7fb77978d835278c5576e07c00b6720402a3.tar.bz2 opensim-SC_OLD-1e7c7fb77978d835278c5576e07c00b6720402a3.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d21a449..975d59e 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -206,13 +206,12 @@ | |||
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. BulletSimN is a purely C# version of BulletSim. | 209 | ;; BulletSim is experimental and in active development. |
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 | ||
216 | ; physics = basicphysics | 215 | ; physics = basicphysics |
217 | ; physics = POS | 216 | ; physics = POS |
218 | 217 | ||