From 917c1695a15c3b8a53c14ede95694ee63e8fac6e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Feb 2013 00:26:34 +0000
Subject: Add documentation on default or Warp3D image module choice to
 OpenSim.ini.example.

As before, default is MapImageModule.
Thanks to Ai Austin for pointing out this omission.
---
 bin/OpenSim.ini.example | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2756b32..b465a25 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -338,6 +338,12 @@
 
 
 [Map]
+    ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
+    ;; The module to use in order to generate map images.
+    ;; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can 
+    ;; generate better images.
+    ;MapImageModule = "MapImageModule"
+    
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
     ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
     ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
-- 
cgit v1.1


From 20760fde257f893f68e75cb721225ccea0c8936d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Feb 2013 00:31:54 +0000
Subject: Improve description of GenerateMapTiles config option

---
 bin/OpenSim.ini.example | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'bin/OpenSim.ini.example')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b465a25..89bc81b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -338,18 +338,19 @@
 
 
 [Map]
+    ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
+    ;; Map tile options.  
+    ;; If true, then maptiles are generated using the MapImageModule below.
+    ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overriden
+    ;; in individual region config file(s).  If you do not want to upload map tiles at all, then you will need 
+    ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
+    ; GenerateMaptiles = true
+
     ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
     ;; The module to use in order to generate map images.
     ;; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can 
     ;; generate better images.
     ;MapImageModule = "MapImageModule"
-    
-    ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
-    ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
-    ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
-    ;; the regions config file(s).  If you do not want to upload map tiles at all, then you will need 
-    ;; to disable the MapImageServiceModule entirely.
-    ; GenerateMaptiles = true
 
     ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
     ;; If desired, a running region can update the map tiles periodically
-- 
cgit v1.1