Merge branch 'master' into httptests

5 files changed, 17 insertions, 2 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 146d538..82bed30 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -110,6 +110,8 @@
     ;; Uncomment if you want to have centralized estate data
     ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
+    MuteListConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MuteListServiceConnector"
+
     ;; Additions for Hypergrid
 
     GatekeeperServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector"
@@ -815,3 +817,6 @@
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
     ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
     BaseDirectory = "./bakes"
+
+[MuteListService]       
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index fac5b60..5690c1d 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -101,6 +101,8 @@
     ;; Uncomment if you want to have centralized estate data
     ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
+    MuteListConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MuteListServiceConnector"
+
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
@@ -569,3 +571,6 @@
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
     ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
     BaseDirectory = "./bakes"
+
+[MuteListService]       
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 988e681..7330f6f 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -25,7 +25,8 @@
     LandServices            = "RemoteLandServicesConnector"
     MapImageService         = "MapImageServiceModule"
     SearchModule            = "BasicSearchModule"
-    
+    MuteListService         = "RemoteMuteListServicesConnector"
+
     LandServiceInConnector        = true
     NeighbourServiceInConnector   = true
     SimulationServiceInConnector  = true
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 10a5b47..aee3d5f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -244,3 +244,6 @@
 
     ;; Capability assigned by the grid administrator for the simulator
     ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
+
+[MuteListService]
+    MuteListServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 709c462..78bcd73 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,7 +30,8 @@
     MapImageService         = "MapImageServiceModule"
     UserManagementModule    = "HGUserManagementModule"
     SearchModule            = "BasicSearchModule"
-    
+    MuteListService         = "RemoteMuteListServicesConnector"
+
     LandServiceInConnector        = true
     NeighbourServiceInConnector   = true
     SimulationServiceInConnector  = true