aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-25 23:04:38 +0000
committerJustin Clark-Casey (justincc)2013-02-25 23:04:38 +0000
commitd0cb4fc3262df2afe2ef34396c7960f7afee6b89 (patch)
tree2037829f95d30302b82536dc10cf5985a2b5df59 /bin/OpenSim.ini.example
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d0cb4fc3262df2afe2ef34396c7960f7afee6b89.zip
opensim-SC_OLD-d0cb4fc3262df2afe2ef34396c7960f7afee6b89.tar.gz
opensim-SC_OLD-d0cb4fc3262df2afe2ef34396c7960f7afee6b89.tar.bz2
opensim-SC_OLD-d0cb4fc3262df2afe2ef34396c7960f7afee6b89.tar.xz
Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example55
1 files changed, 29 insertions, 26 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5aeae8a..2756b32 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -268,32 +268,6 @@
268 ;; Default script engine to use. Currently, we only have XEngine 268 ;; Default script engine to use. Currently, we only have XEngine
269 ; DefaultScriptEngine = "XEngine" 269 ; DefaultScriptEngine = "XEngine"
270 270
271 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
272 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
273 ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
274 ;; the regions config file(s). If you do not want to upload map tiles at all, then you will need
275 ;; to disable the MapImageServiceModule entirely.
276 ; GenerateMaptiles = true
277
278 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
279 ;; If desired, a running region can update the map tiles periodically
280 ;; to reflect building activity. This names no sense of you don't have
281 ;; prims on maptiles. Value is in seconds.
282 ; MaptileRefresh = 0
283
284 ;# {MaptileStaticUUID} {} {Asset ID for static map texture} {} 00000000-0000-0000-0000-000000000000
285 ;; If not generating maptiles, use this static texture asset ID
286 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
287
288 ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
289 ;; Use terrain texture for maptiles if true, use shaded green if false
290 ; TextureOnMapTile = true
291
292 ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
293 ;; Draw objects on maptile. This step might take a long time if you've
294 ;; got a large number of objects, so you can turn it off here if you'd like.
295 ; DrawPrimOnMapTile = true
296
297 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080 271 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
298 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if 272 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if
299 ;; required 273 ;; required
@@ -362,6 +336,35 @@
362 ;; This is a default that can be overwritten in some sections. 336 ;; This is a default that can be overwritten in some sections.
363 ; GatekeeperURI = "http://127.0.0.1:9000" 337 ; GatekeeperURI = "http://127.0.0.1:9000"
364 338
339
340[Map]
341 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
342 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
343 ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
344 ;; the regions config file(s). If you do not want to upload map tiles at all, then you will need
345 ;; to disable the MapImageServiceModule entirely.
346 ; GenerateMaptiles = true
347
348 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
349 ;; If desired, a running region can update the map tiles periodically
350 ;; to reflect building activity. This names no sense of you don't have
351 ;; prims on maptiles. Value is in seconds.
352 ; MaptileRefresh = 0
353
354 ;# {MaptileStaticUUID} {} {Asset ID for static map texture} {} 00000000-0000-0000-0000-000000000000
355 ;; If not generating maptiles, use this static texture asset ID
356 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
357
358 ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
359 ;; Use terrain texture for maptiles if true, use shaded green if false
360 ; TextureOnMapTile = true
361
362 ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
363 ;; Draw objects on maptile. This step might take a long time if you've
364 ;; got a large number of objects, so you can turn it off here if you'd like.
365 ; DrawPrimOnMapTile = true
366
367
365[Estates] 368[Estates]
366 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). 369 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
367 ; If these values are uncommented then they will be used to create a default estate as necessary. 370 ; If these values are uncommented then they will be used to create a default estate as necessary.