Merge branch 'master' into httptests

# Conflicts:
#	prebuild.xml

3 files changed, 23 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c8b3e5d..3021dfa 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -378,6 +378,21 @@
     ;; Attempt to render meshes and sculpties on the map.
     ; RenderMeshes = false
 
+    ;# {MapColorWater} {} {Water color for textured and shaded maps} {"#1D475F"}
+    ; MapColorWater = "#3399FF"
+
+    ;# {MapColor1} {} {Terrain color 1 for textured maps} {"#A58976"}
+    ; MapColor1 = "#A58976"
+
+    ;# {MapColor2} {} {Terrain color 2 for textured maps} {"#455931"}
+    ; MapColor2 = "#455931"
+
+    ;# {MapColor3} {} {Terrain color 3 for textured maps} {"#A29A8D"}
+    ; MapColor3 = "#A29A8D"
+
+    ;# {MapColor4} {} {Terrain color 4 for textured maps} {"#C8C8C8"}
+    ; MapColor4 = "#C8C8C8"
+
 
 [Permissions]
     ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index db7cb36..4e683e2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,7 @@
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService         = "MapImageServiceModule"
     SearchModule            = "BasicSearchModule"
+        MuteListService                 = "LocalMuteListServicesConnector"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
@@ -113,6 +114,9 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
+[MuteListService]       
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
+        
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 84867a9..4f3994f 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -27,6 +27,7 @@
     FriendsModule           = "HGFriendsModule"
     UserManagementModule    = "HGUserManagementModule"
     SearchModule            = "BasicSearchModule"
+        MuteListService                 = "LocalMuteListServicesConnector"      
     
     InventoryServiceInConnector       = true
     AssetServiceInConnector           = true
@@ -190,6 +191,9 @@
     UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
     InGatekeeper = True
 
+[MuteListService]       
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
+        
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"