diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /bin/OpenSim.ini.example | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bcfaf76..c36d2a4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -151,6 +151,7 @@ | |||
| 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 |
| 153 | ;; objects phantom | 153 | ;; objects phantom |
| 154 | ;; The Bullet plugins do not work properly right now. A better Bullet plugin is on the way. | ||
| 154 | ;; Default is OpenDynamicsEngine | 155 | ;; Default is OpenDynamicsEngine |
| 155 | ; physics = OpenDynamicsEngine | 156 | ; physics = OpenDynamicsEngine |
| 156 | ; physics = basicphysics | 157 | ; physics = basicphysics |
| @@ -318,8 +319,8 @@ | |||
| 318 | ; meant to override the MapImage and search server url given at login, and varying | 319 | ; meant to override the MapImage and search server url given at login, and varying |
| 319 | ; on a sim-basis. | 320 | ; on a sim-basis. |
| 320 | ; Viewers that don't understand it, will ignore it | 321 | ; Viewers that don't understand it, will ignore it |
| 321 | ;MapImageServerURI = "http://127.0.0.1:9000/ | 322 | ;MapImageServerURI = "http://127.0.0.1:9000/" |
| 322 | ;SearchServerURI = "http://127.0.0.1:9000/ | 323 | ;SearchServerURI = "http://127.0.0.1:9000/" |
| 323 | 324 | ||
| 324 | 325 | ||
| 325 | [Chat] | 326 | [Chat] |