aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
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/OpenSimDefaults.ini
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 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini50
1 files changed, 24 insertions, 26 deletions
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