diff options
| author | Melanie | 2011-11-05 22:56:08 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 22:56:08 +0000 |
| commit | facdc9c46e45ebd29217d7f217aec6b16048cc73 (patch) | |
| tree | ce4a0ce073ae6eb087c3d47e2cf7fec1b3e25bea /bin | |
| parent | Whitespace fix from core (diff) | |
| parent | Remove spammy autopilot debug (diff) | |
| download | opensim-SC-facdc9c46e45ebd29217d7f217aec6b16048cc73.zip opensim-SC-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.gz opensim-SC-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.bz2 opensim-SC-facdc9c46e45ebd29217d7f217aec6b16048cc73.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a02de72..3e6a893 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -298,10 +298,6 @@ | |||
| 298 | ; won't look right until the physics engine supports it | 298 | ; won't look right until the physics engine supports it |
| 299 | ; (i.e delays takeoff for a moment) | 299 | ; (i.e delays takeoff for a moment) |
| 300 | 300 | ||
| 301 | ; This is commented so it will come on automatically once it's | ||
| 302 | ; supported. | ||
| 303 | ; enableprejump = true | ||
| 304 | |||
| 305 | ; Simulator Stats URI | 301 | ; Simulator Stats URI |
| 306 | ; Enable JSON simulator data by setting a URI name (case sensitive) | 302 | ; Enable JSON simulator data by setting a URI name (case sensitive) |
| 307 | ; Stats_URI = "jsonSimStats" | 303 | ; Stats_URI = "jsonSimStats" |