From 1c758ae01c514df4742a9cdae6480e8011debf38 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Jul 2011 03:08:58 +0100
Subject: make default TextureOnMapTile true for the older map imager

Don't know of a good reason not to do this, seems to work fine.
---
 bin/OpenSim.ini.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 60d37fb..b706926 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -68,9 +68,9 @@
     ;; in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
-    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false
+    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
     ;; Use terrain texture for maptiles if true, use shaded green if false
-    ; TextureOnMapTile = false
+    ; TextureOnMapTile = true
 
     ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
     ;; Draw objects on maptile.  This step might take a long time if you've
-- 
cgit v1.1


From 69c2d3434a314b962deda9557b280718c22bab9c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Jul 2011 03:13:54 +0100
Subject: minor: remove the pointless quotes from the GenerateMaptiles option

---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b706926..b21e3e2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -190,7 +190,7 @@
     ;; 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
-    ; GenerateMaptiles = "true"
+    ; GenerateMaptiles = true
 
     ;; If desired, a running region can update the map tiles periodically
     ;; to reflect building activity. This names no sense of you don't have
-- 
cgit v1.1


From 0a09c45726a0115b34c34ecbfa5bf48dff501590 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Jul 2011 03:18:10 +0100
Subject: minor: group all the map tile options together

---
 bin/OpenSim.ini.example | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b21e3e2..acad0f3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -68,15 +68,6 @@
     ;; in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
-    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
-    ;; Use terrain texture for maptiles if true, use shaded green if false
-    ; TextureOnMapTile = true
-
-    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
-    ;; 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
-
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
     ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
@@ -200,6 +191,15 @@
     ;; If not generating maptiles, use this static texture asset ID
     ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
+    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
+    ;; Use terrain texture for maptiles if true, use shaded green if false
+    ; TextureOnMapTile = true
+
+    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
+    ;; 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
+
     ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
     ; HttpProxy = "http://proxy.com:8080"
 
-- 
cgit v1.1


From e1ce1067902614df732422721b8806e978a36f5f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Jul 2011 03:21:19 +0100
Subject: make [SMTP] default comment option match actual default

---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index acad0f3..2fe4db7 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -218,7 +218,7 @@
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
 
-    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true
+    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
     ;; Enable sending email via SMTP
     ; enabled = false
 
-- 
cgit v1.1