aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2013-02-27 18:05:04 +0000
committerMelanie2013-02-27 18:05:04 +0000
commit578174d21c82e7249016e31f0c63215e67f92f17 (patch)
treec9c970d2ce4836dcf894922172d784d16cbc2837 /bin/OpenSim.ini.example
parentMerge branch 'master' into careminster (diff)
parentImprove description of GenerateMapTiles config option (diff)
downloadopensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.zip
opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.gz
opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.bz2
opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example15
1 files changed, 11 insertions, 4 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cf8b3e1..9de3862 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -335,12 +335,19 @@
335 335
336[Map] 336[Map]
337 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true 337 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
338 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to 338 ;; Map tile options.
339 ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in 339 ;; If true, then maptiles are generated using the MapImageModule below.
340 ;; the regions config file(s). If you do not want to upload map tiles at all, then you will need 340 ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overriden
341 ;; to disable the MapImageServiceModule entirely. 341 ;; in individual region config file(s). If you do not want to upload map tiles at all, then you will need
342 ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
342 ; GenerateMaptiles = true 343 ; GenerateMaptiles = true
343 344
345 ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
346 ;; The module to use in order to generate map images.
347 ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can
348 ;; generate better images.
349 ;MapImageModule = "MapImageModule"
350
344 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0 351 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
345 ;; If desired, a running region can update the map tiles periodically 352 ;; If desired, a running region can update the map tiles periodically
346 ;; to reflect building activity. This names no sense of you don't have 353 ;; to reflect building activity. This names no sense of you don't have