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/OpenSimDefaults.ini | |
| 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 '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 2877541..e38c0ea 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -217,6 +217,9 @@ | |||
| 217 | ;WorldMapModule = "WorldMap" | 217 | ;WorldMapModule = "WorldMap" |
| 218 | ;MapImageModule = "MapImageModule" | 218 | ;MapImageModule = "MapImageModule" |
| 219 | 219 | ||
| 220 | ; World map blacklist timeout in seconds | ||
| 221 | ;BlacklistTimeout = 600 | ||
| 222 | |||
| 220 | ; Set to false to not generate any maptiles | 223 | ; Set to false to not generate any maptiles |
| 221 | ;GenerateMaptiles = true | 224 | ;GenerateMaptiles = true |
| 222 | 225 | ||