2 files changed, 38 insertions, 48 deletions

diff --git a/config/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
index 1281aee..26accd9 100644
--- a/config/config-include/GridCommon.ini
+++ b/bin/config-include/GridCommon.ini
@@ -1,5 +1,5 @@
 ; This is the main configuration file for an instance of OpenSim running in grid mode
-; In particular, this one is set up for connecting to Infinite Grid.
+; In particular, this one is set up for connecting to IG or MG.
 
 [DatabaseService]
     ;
@@ -47,7 +47,7 @@
     ;; runs the UserAgentsService.
     ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
     ;; If this is a standalone world, this is the address of this instance.
@@ -55,7 +55,7 @@
     ;; that runs the Gatekeeper service.
     ;; For example http://myworld.com:9000 or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
+    GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -77,11 +77,6 @@
     ;; Authorization is not on by default, as it depends on external php
     ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
 
-    ;; To allow the Teleport and Show on Map buttons to work properly (for search
-    ;; results containing locations).  From ossearch module.
-;    LandServices = "RemoteLandServicesConnector"
-;    LandServiceInConnector = "true"
-
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
@@ -89,18 +84,14 @@
     ;
     ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
-    AssetServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-
-    ConnectionString = "${Const|ConnectionString}"
-
+    AssetServerURI = "${Const|BaseURL}:${Const|AssetServerPort}"
 
 [InventoryService]
     ;
     ; Change this to your grid-wide inventory server
     ;
     InventoryServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-
-    ConnectionString = "${Const|ConnectionString}"
+    ;MaxRetries = 0
 
 [GridInfo]
     ;
@@ -116,13 +107,13 @@
     AllowHypergridMapSearch = true
 
     ;; Directory for map tile images of linked regions
-    MapTileDirectory = "${Const|CachePath}/maptiles"
+    MapTileDirectory = "${Paths|CachePath}/maptiles"
 
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper="${Const|GridURL}:${Const|PublicPort}"
+    GatekeeperURI="${Const|GridURL}:${Const|PublicPort}"
 
 [EstateDataStore]
     ;
@@ -137,9 +128,9 @@
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
+    GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
 
 [AvatarService]
     ;
@@ -147,8 +138,6 @@
     ;
     AvatarServerURI = "${Const|GridURL}:${Const|PrivatePort}"
 
-    ConnectionString = "${Const|ConnectionString}"
-
 [AgentPreferencesService]
     ;
     ; Change this to your grid-wide avatar prefs server
@@ -167,40 +156,32 @@
     ;
     UserAccountServerURI = "${Const|GridURL}:${Const|PrivatePort}"
 
-    ConnectionString = "${Const|ConnectionString}"
-
 [GridUserService]
     ;
     ; Change this to your grid-wide user accounts server
     ;
     GridUserServerURI = "${Const|GridURL}:${Const|PrivatePort}"
 
-    ConnectionString = "${Const|ConnectionString}"
-
 [AuthenticationService]
     ;
     ; Change this to your grid-wide authentication server
     ;
     AuthenticationServerURI = "${Const|GridURL}:${Const|PrivatePort}"
 
-    ConnectionString = "${Const|ConnectionString}"
-
 [FriendsService]
     ;
     ; Change this to your grid-wide friends server
     ;
     FriendsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
 
-    ConnectionString = "${Const|ConnectionString}"
-
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|GridURL}:${Const|PublicPort}"
-    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
+    GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
     ;; Default is true.
@@ -212,7 +193,7 @@
 
     ;; Warning: advanced and unusual. Default is false.
     ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; while separating regions' assets from users' assets. Asset transfer between
     ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|GridURL}:${Const|PublicPort}
@@ -221,7 +202,7 @@
 [HGAssetService]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|GridURL}:${Const|PublicPort}"
@@ -229,11 +210,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
@@ -270,3 +251,5 @@
     ;; Capability assigned by the grid administrator for the simulator
     ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
 
+[MuteListService]
+    MuteListServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
diff --git a/config/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0922cf5..47771e3 100644
--- a/config/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
@@ -32,6 +32,9 @@
     ;StorageProvider = "OpenSim.Data.PGSQL.dll"
     ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
 
+    StorageProvider = "${Const|DataProvider}"
+    ConnectionString = "${Const|ConnectionString}"
+
 [Hypergrid]
     ; Uncomment the variables in this section only if you are in
     ; Hypergrid configuration. Otherwise, ignore.
@@ -85,6 +88,7 @@
     ; Change this to your grid-wide inventory server
     ;
     InventoryServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    ;MaxRetries = 0
 
 [GridInfo]
     ;
@@ -104,9 +108,9 @@
 
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
+    GatekeeperURI="${Const|BaseURL}:${Const|PublicPort}"
 
 [EstateDataStore]
     ;
@@ -121,9 +125,9 @@
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
+    GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [AvatarService]
     ;
@@ -170,11 +174,11 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
-    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
+    GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
     ;; Default is true.
@@ -186,7 +190,7 @@
 
     ;; Warning: advanced and unusual. Default is false.
     ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; while separating regions' assets from users' assets. Asset transfer between
     ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
@@ -195,7 +199,7 @@
 [HGAssetService]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -203,11 +207,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
@@ -243,3 +247,6 @@
 
     ;; Capability assigned by the grid administrator for the simulator
     ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
+
+[MuteListService]
+    MuteListServerURI = "${Const|BaseURL}:${Const|PrivatePort}"