aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2013-02-25 16:28:12 -0800
committerDiva Canto2013-02-25 16:28:12 -0800
commita356978c794c4a5b0bac4d6a05bf8534885edc68 (patch)
tree6b670d7e458aab7feff4d804a14c3a47e04d91f9 /bin
parentMantis #6552 -- stricter error (crash) if server URL is malformed. (diff)
parentMove map related settings from [Startup] to a new [Map] section in OpenSim.ini (diff)
downloadopensim-SC_OLD-a356978c794c4a5b0bac4d6a05bf8534885edc68.zip
opensim-SC_OLD-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.gz
opensim-SC_OLD-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.bz2
opensim-SC_OLD-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example55
-rw-r--r--bin/OpenSimDefaults.ini50
2 files changed, 53 insertions, 52 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.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2512428..6ecb5df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -285,32 +285,6 @@
285 DefaultScriptEngine = "XEngine" 285 DefaultScriptEngine = "XEngine"
286 286
287 ; ## 287 ; ##
288 ; ## WORLD MAP
289 ; ##
290
291 ;WorldMapModule = "WorldMap"
292 ;MapImageModule = "MapImageModule"
293
294 ; World map blacklist timeout in seconds
295 ;BlacklistTimeout = 600
296
297 ; Set to false to not generate any maptiles
298 ;GenerateMaptiles = true
299
300 ; Refresh (in seconds) the map tile periodically
301 ;MaptileRefresh = 0
302
303 ; If not generating maptiles, use this static texture asset ID
304 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
305
306 ; Draw objects on maptile. This step might take a long time if you've got a large number of
307 ; objects, so you can turn it off here if you'd like.
308 DrawPrimOnMapTile = true
309
310 ; Use terrain texture for maptiles if true, use shaded green if false
311 TextureOnMapTile = true
312
313 ; ##
314 ; ## EMAIL MODULE 288 ; ## EMAIL MODULE
315 ; ## 289 ; ##
316 290
@@ -347,6 +321,30 @@
347 UseTrashOnDelete = True 321 UseTrashOnDelete = True
348 322
349 323
324[Map]
325 ;WorldMapModule = "WorldMap"
326 ;MapImageModule = "MapImageModule"
327
328 ; World map blacklist timeout in seconds
329 ;BlacklistTimeout = 600
330
331 ; Set to false to not generate any maptiles
332 ;GenerateMaptiles = true
333
334 ; Refresh (in seconds) the map tile periodically
335 ;MaptileRefresh = 0
336
337 ; If not generating maptiles, use this static texture asset ID
338 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
339
340 ; Draw objects on maptile. This step might take a long time if you've got a large number of
341 ; objects, so you can turn it off here if you'd like.
342 DrawPrimOnMapTile = true
343
344 ; Use terrain texture for maptiles if true, use shaded green if false
345 TextureOnMapTile = true
346
347
350[RegionReady] 348[RegionReady]
351 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled 349 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
352 enabled = true 350 enabled = true