Merge branch 'master' into careminster

2 files changed, 4 insertions, 4 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 26eb8ed..7e7b231 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -265,9 +265,10 @@
     ; DefaultScriptEngine = "XEngine"
 
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
-    ;; Map tile options. You can choose to generate no map tiles at all,
-    ;; generate normal maptiles, or nominate an uploaded texture to
-    ;; be the map tile
+    ;; 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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa88146..2edc1f8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,7 +1,6 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
-
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt