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')

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')

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


From 1bef19b91435ffd7907cac8119014c0b5a6382f9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Feb 2013 21:45:31 +0000
Subject: Do not have the Freeswitch connector on by default in Robust ini
 example files.

This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch)
and requires a complicated Freeswitch setup.
Having it on but not configured results in spurious warnings in the logs
---
 bin/Robust.HG.ini.example | 3 ++-
 bin/Robust.ini.example    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 53676a3..aae76d5 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -52,7 +52,8 @@
 
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
-VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below)
+;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
 GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
 GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
 AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index bb98bbf..d932ce7 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -30,7 +30,8 @@
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
-VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below)
+;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
 GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
 GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
 AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
-- 
cgit v1.1