Merge branch 'master' into careminster

1 files changed, 24 insertions, 26 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e2d952a..0a66523 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -281,32 +281,6 @@
     DefaultScriptEngine = "XEngine"
 
     ; ##
-    ; ## WORLD MAP
-    ; ##
-
-    ;WorldMapModule = "WorldMap"
-    ;MapImageModule = "MapImageModule"
-
-    ; World map blacklist timeout in seconds
-    ;BlacklistTimeout = 600
-
-    ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = true
-
-    ; Refresh (in seconds) the map tile periodically
-    ;MaptileRefresh = 0
-
-    ; If not generating maptiles, use this static texture asset ID
-    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
-
-    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = true
-
-    ; ##
     ; ## EMAIL MODULE
     ; ##
 
@@ -343,6 +317,30 @@
     UseTrashOnDelete = True
 
 
+[Map]
+    ;WorldMapModule = "WorldMap"
+    ;MapImageModule = "MapImageModule"
+
+    ; World map blacklist timeout in seconds
+    ;BlacklistTimeout = 600
+
+    ; Set to false to not generate any maptiles
+    ;GenerateMaptiles = true
+
+    ; Refresh (in seconds) the map tile periodically
+    ;MaptileRefresh = 0
+
+    ; If not generating maptiles, use this static texture asset ID
+    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
+
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = true
+
+
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
     enabled = true