diff options
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSim.ini.example | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index c36d2a4..0ef6880 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -149,14 +149,11 @@ | |||
| 149 | 149 | ||
| 150 | ;; Choose one of the physics engines below | 150 | ;; Choose one of the physics engines below |
| 151 | ;; OpenDynamicsEngine is by some distance the most developed physics engine | 151 | ;; OpenDynamicsEngine is by some distance the most developed physics engine |
| 152 | ;; basicphysics effectively does not model physics at all, making all | 152 | ;; basicphysics effectively does not model physics at all, making all objects phantom |
| 153 | ;; objects phantom | ||
| 154 | ;; The Bullet plugins do not work properly right now. A better Bullet plugin is on the way. | ||
| 155 | ;; Default is OpenDynamicsEngine | 153 | ;; Default is OpenDynamicsEngine |
| 156 | ; physics = OpenDynamicsEngine | 154 | ; physics = OpenDynamicsEngine |
| 157 | ; physics = basicphysics | 155 | ; physics = basicphysics |
| 158 | ; physics = POS | 156 | ; physics = POS |
| 159 | ; physics = modified_BulletX | ||
| 160 | 157 | ||
| 161 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule | 158 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule |
| 162 | ;; Permission modules to use, separated by space. | 159 | ;; Permission modules to use, separated by space. |