2 files changed, 144 insertions, 135 deletions

diff --git a/config/Robust.ini.template b/bin/Robust.ini
index 46de83c..705ffad 100644
--- a/config/Robust.ini.template
+++ b/bin/Robust.ini
@@ -1,14 +1,7 @@
-; * Run
-; * $ Robust.exe -inifile Robust.HG.ini
-; *
 
-; * Configurations for enabling HG1.5
-; * 
-; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
-; *                     OpenSim.Server.Handlers.dll:UserAgentService
-; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and 
-; *            OpenSim.Server.Handlers.dll:XInventoryInConnector 
-; * are started in port 8002, outside the firewall
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
 
 
 ; * The startup section lists all the connectors to start up in this server
@@ -24,26 +17,26 @@
 [Startup]
     ; Place to create a PID file
     ; If no path if specified then a PID file is not created.
-    PIDFile = "/var/run/opensim/ROBUST.pid"
+    PIDFile = ""${Paths|CachePath}"/ROBUST.pid"
 
     ; Plugin Registry Location
     ; Set path to directory for plugin registry. Information
     ; about the registered repositories and installed plugins
     ; will be stored here
     ; The Robust.exe process must have R/W access to the location 
-    RegistryLocation = "${Const|CachePath}"
+    RegistryLocation = "${Paths|CachePath}"
 
     ; Modular configurations
     ; Set path to directory for modular ini files...
     ; The Robust.exe process must have R/W access to the location, and it must NOT be shared by the OpenSim.exe process, coz that confuses things.
-    ConfigDirectory = "${Const|ConfigPath}/ROBUST"
+    ConfigDirectory = "${Paths|ConfigPath}/ROBUST"
 
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
     ConsoleHistoryFileEnabled = true
 
     ; The history file can be just a filename (relative to OpenSim's bin/ directory
     ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/)
-    ConsoleHistoryFile = "RobustConsoleHistory.txt"
+    ConsoleHistoryFile = "${Paths|LogPath}/RobustConsoleHistory.txt"
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
@@ -74,6 +67,14 @@
     ;; Uncomment to provide bakes caching
     BakedTextureService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XBakesConnector"
 
+    ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
+    UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
+
+    ;; 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"
@@ -86,11 +87,9 @@
     ;; Uncomment this if you want Groups V2, HG to work
     HGGroupsServiceConnector = "${Const|PublicPort}/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector"
 
-    ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
-    UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
+    ;; Basic web server.
+    WebServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:WebServerConnector"
 
-    ;; Uncomment if you want to have centralized estate data
-    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -129,7 +128,7 @@
     ;; This is useful in cases where you want to protect most of the services,
     ;; but unprotect individual services. Username and Password can also be
     ;; overriden if you want to use different credentials for the different services.
-    ;; Hypergrid services are not affected by this; they are publicly available 
+    ;; Hypergrid services are not affected by this; they are publicly available
     ;; by design.
 
     ;; By default, scripts are not allowed to call private services via llHttpRequest()
@@ -146,21 +145,20 @@
     ;ConsolePass = secret
     ;ConsolePort = 0
 
-
 [Hypergrid]
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
     ;; This is the address of the external robust server that
     ;; runs the UserAgentsService, possibly this server.
     ;; For example 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} {}
     ;; This is the address of the external robust server
     ;; that runs the Gatekeeper service, possibly this server.
     ;; For example 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}"
 
 [AccessControl]
     ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
@@ -205,14 +203,13 @@
 [AssetService]
 
     ;; Choose an asset service (Only one option should be enabled)
-    ; When changing this, change [HGAssetService] below to match.
     ;LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
 
     ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
     ;; These directories must be on the same physical filesystem
-    BaseDirectory = "${Const|AssetsPath}/data"
-    SpoolDirectory = "${Const|AssetsPath}/tmp"
+    BaseDirectory = "${Paths|AssetsPath}/data"
+    SpoolDirectory = "${Paths|AssetsPath}/tmp"
 
     ;; Original service can be checked if FSAssets can not find an asset
     FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
@@ -221,6 +218,9 @@
     ;; Reduces DB calls if asset is requested often. Default value 0 will always update access time
     DaysBetweenAccessTimeUpdates = 1
 
+    ;; Should FSAssets print read/write stats to the robust console, default is true
+    ShowConsoleStats = false
+
     ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
     ;StorageProvider = ""
     ;ConnectionString = ""
@@ -245,7 +245,6 @@
     ; Default is false.
     AllowRemoteDeleteAllTypes = false
 
-
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
 ; *
@@ -265,11 +264,14 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 
     ; Realm = "regions"
-    ; AllowDuplicateNames = "True"
+    ; AllowDuplicateNames = ""
 
     ;; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
 
+    ;; Directory for map tile images of linked regions
+    MapTileDirectory = "${Paths|CachePath}/maptiles"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
@@ -283,7 +285,7 @@
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
     ;;
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
     ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
@@ -293,9 +295,6 @@
     ;; Example specification:
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
     ; (replace spaces with underscore)
-    Region_Welcome            = "DefaultRegion, FallbackRegion, Persistent"
-    Region_Sandbox            = "DefaultRegion, FallbackRegion, Persistent"
-    Region_Kellietown         = "DefaultRegion, FallbackRegion, Persistent"
 
     ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
@@ -305,7 +304,7 @@
     ExportSupported = true
 
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 ; * This is the configuration for the freeswitch server in grid mode
@@ -339,19 +338,19 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
 
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. 
+; * is implemented.
 ; *
 [AuthenticationService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ; Realm = "useraccounts"
+    ; Realm = "auth"
 
     ;; Allow the service to process HTTP getauthinfo calls.
     ;; Default is false.
@@ -374,13 +373,13 @@
 
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
-; * It defaults to "useraccounts", which uses the new style.
+; * It defaults to "UserAccounts", which uses the new style.
 ; * Realm = "users" will use the legacy tables as an authentication source
 ; *
 [UserAccountService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; Realm = "useraccounts"
+    ; Realm = "UserAccounts"
 
     ; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -390,7 +389,7 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
     CreateDefaultAvatarEntries = true
@@ -417,10 +416,6 @@
 [PresenceService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-    ; Set this to true to allow the use of advanced web services and multiple
-    ; bots using one account
-    AllowDuplicatePresences = false;
-
 
 [AvatarService]
     ; for the server connector
@@ -452,14 +447,22 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    ; The minimum user level required for a user to be able to login.  0 by default
+    ; If you disable a particular user's account then you can set their login level below this number.
+    ; You can also change this level from the console though these changes will not be persisted.
+    ; MinLoginLevel = 0
+
+    ;; for hypergrid
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
 
     ; This inventory service will be used to initialize the user's inventory
-    HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-    HGInventoryServiceConstructorArg = "HGInventoryService"
+    HGInventoryServicePlugin = "HGInventoryService@OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+    ; NOTE: HGInventoryServiceConstructorArg is deprecated. For now it will work, but see above
+        ;       for the correct method if passing additional arguments.
+    ;; end hypergrid
 
-    ;; Ask co-operative viewers to use a different currency name
+    ; Ask co-operative viewers to use a different currency name
     Currency = "v "
 
     ;; Set minimum fee to publish classified
@@ -469,31 +472,31 @@
     AllowRemoteSetLoginLevel = "false"
 
     ; For V2 map
-    MapTileURL = "${Const|GridURL}:${Const|PublicPort}/";
+    MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; Url to search service
-    ; SearchURL = "${Const|GridURL}:${Const|PublicPort}/";
+    ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; For V3 destination guide
-    ; DestinationGuide = "${Const|GridURL}/guide"
+    ; DestinationGuide = "${Const|BaseURL}/guide"
 
     ; For V3 avatar picker (( work in progress ))
-    ; AvatarPicker = "${Const|GridURL}/avatars"
+    ; AvatarPicker = "${Const|BaseURL}/avatars"
 
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
     ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_InventoryServerURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_AssetServerURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_ProfileServerURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_FriendsServerURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_IMServerURI = "${Const|GridURL}:${Const|PublicPort}"
-    SRV_GroupsServerURI = "${Const|GridURL}:${Const|PublicPort}"
+    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_FriendsServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_IMServerURI = "${Const|BaseURL}:${Const|PublicPort}"
+    SRV_GroupsServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
     ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
@@ -501,7 +504,7 @@
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
     ;; Options are
-    ;;   "none"     no DST 
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -530,7 +533,7 @@
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
     ; Set this if you want to change the default
-    ; TilesStoragePath = "maptiles"
+     TilesStoragePath = "${Paths|CachePath}/maptiles"
     ;
     ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
     ; you may want to set this. Otherwise, don't set it, because it's already protected.
@@ -550,7 +553,7 @@
     ; See http://opensimulator.org/wiki/GridInfo
 
     ; login uri: for grid this is the login server URI
-    login = ${Const|GridURL}:${Const|PublicPort}/
+    login = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; long grid name: the long name of your grid
     gridname = "${Const|GridName}"
@@ -560,32 +563,32 @@
 
     ; login page: optional: if it exists it will be used to tell the client to use
     ;                       this as splash page
-    welcome = ${Const|GridURL}/drupal/loginpage
+    welcome = ${Const|BaseURL}:${Const|PublicPort}/web/loginpage.html
 
     ; helper uri: optional: if it exists it will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = ${Const|GridURL}/economy
+    ;economy = ${Const|SSLURL}:${Const|PublicSSLPort}/economy
 
     ; web page of grid: optional: page providing further information about your grid
-    about = ${Const|GridURL}/drupal/
+    about = ${Const|BaseURL}:${Const|PublicPort}/web/about.html
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
-    register = ${Const|GridURL}/drupal/content/How_to_join
+    register = ${Const|SSLURL}:${Const|PublicSSLPort}/web/account.html
 
     ; help: optional: page providing further assistance for users of your grid
-    help = ${Const|GridURL}/drupal/Tags/help
+    help = ${Const|BaseURL}:${Const|PublicPort}/web/help.html
 
     ; password help: optional: page providing password assistance for users of your grid
-    password = ${Const|GridURL}/drupal
+    password = ${Const|SSLURL}:${Const|PublicSSLPort}/web/password_help.html
 
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
-    ; gatekeeper = ${Const|GridURL}:${Const|PublicPort}/
+    gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; HG user domain, if you have one
     ; this is the entry point for all user-related HG services
-    ; uas = ${Const|GridURL}:${Const|PublicPort}/
+    uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 
 [GatekeeperService]
@@ -600,9 +603,9 @@
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
     ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
-    ; ExternalName = "${Const|GridURL}:${Const|PublicPort}"
+    ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
-    ; Does this grid allow incoming links to any region in it? 
+    ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
 
@@ -667,10 +670,10 @@
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the inventory operations while in other grids.
-; * Still not completely safe, especially if users perform inventory operations 
+; * Still not completely safe, especially if users perform inventory operations
 ; * while in those grids. The more the user accesses his/her inventory, the more
 ; * those simulators will know about the user's inventory.
-; * 
+; *
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
@@ -683,42 +686,44 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-    ; HGInventoryService is a public-facing inventory service that allows users to 
+    ; HGInventoryService is a public-facing inventory service that allows users to
     ; interact with their suitcase folder when on a foreign grid.  This reuses the general inventory service connector.
     ; Hence, if the user has set up authentication in [Network] to protect their private services
     ; make sure it is not set here.
     AuthType = None
 
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
 ; * the assets of this world.
-; * 
+; *
 [HGAssetService]
+    ;; Use the second option if you have FSAsset service enabled
 ;    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFSAssetService"
+
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
-    ; HGAssetService is a public-facing service that allows users to  
+    ; HGAssetService is a public-facing service that allows users to
     ; read and create assets when on another grid.  This reuses the general asset service connector.
     ; Hence, if the user has set up authentication in [Network] to protect their private services
     ; make sure it is overriden for this public service.
     AuthType = None
 
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; 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"
@@ -754,7 +759,8 @@
 
     ;; What is the HomeURI of users associated with this grid?
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; end hypergrid
 
     ;; Sets the maximum number of groups an agent may join
     MaxAgentGroups = 420
@@ -773,4 +779,11 @@
 [BakedTextureService]
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
     ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
-    BaseDirectory = "bakes"
+    BaseDirectory = "${Paths|CachePath}/bakes"
+
+[MuteListService]
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
+
+
+[WebService]
+    Include-Common = ../../config/ROBUST/RobustExtra.ini
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 099d4da..e5d3d1a 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -4,20 +4,20 @@
 ; **
 ; *
 ; * The Const section allows us to define some basic information that we
-; * will use throughout our configuration. We will provide examples for 
+; * will use throughout our configuration. We will provide examples for
 ; * setting the base url of the Robust server and the public and private ports
 ; * it uses. Changing the values of the constants will set the operating
 ; * parameters thoughout the configuration. Other constants that may prove
-; * to be useful may be added to the followin section. They may be 
+; * to be useful may be added to the followin section. They may be
 ; * referenced anywhere in the configuration by using ${Const|Name}. One
 ; * such use is providing a base path for setting locations that Robust
 ; * uses to write data.
-; * 
+; *
 [Const]
 
     ; The URL of the Robust server
     BaseURL = "http://127.0.0.1"
-    
+
     ; The public port of the Robust server
     PublicPort = "8002"
 
@@ -44,14 +44,14 @@
     ; Set path to directory for plugin registry. Information
     ; about the registered repositories and installed plugins
     ; will be stored here
-    ; The Robust.exe process must have R/W access to the location 
+    ; The Robust.exe process must have R/W access to the location
     RegistryLocation = "."
 
     ; Modular configurations
     ; Set path to directory for modular ini files...
-    ; The Robust.exe process must have R/W access to the location 
-    ConfigDirectory = "."
-    
+    ; The Robust.exe process must have R/W access to the location
+    ConfigDirectory = "robust-include"
+
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
     ConsoleHistoryFileEnabled = true
 
@@ -61,7 +61,7 @@
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
-  
+
 [ServiceList]
     AssetServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AssetServiceConnector"
     InventoryInConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XInventoryInConnector"
@@ -81,11 +81,11 @@
     MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
     MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
     ;; Uncomment this if you want offline IM to work
-    ;OfflineIMServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+    ; OfflineIMServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
     ;; Uncomment this if you want Groups V2 to work
-    ;GroupsServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
+    ; GroupsServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
     ;; Uncomment to provide bakes caching
-    ;BakedTextureService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XBakesConnector"
+    ; BakedTextureService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XBakesConnector"
 
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
@@ -93,6 +93,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
 ; *
@@ -130,7 +132,7 @@
     ;; This is useful in cases where you want to protect most of the services,
     ;; but unprotect individual services. Username and Password can also be
     ;; overriden if you want to use different credentials for the different services.
-    
+
     ;; By default, scripts are not allowed to call private services via llHttpRequest()
     ;; Such calls are detected by the X-SecondLife-Shared HTTP header
     ;; If you allow such calls you must be sure that they are restricted to very trusted scripters
@@ -191,27 +193,30 @@
     ;; Choose an asset service (Only one option should be enabled)
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
-    
+
     ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
     ;; These directories must be on the same physical filesystem
     ;BaseDirectory = "./fsassets/data"
     ;SpoolDirectory = "./fsassets/tmp"
-    
+
     ;; Original service can be checked if FSAssets can not find an asset
     ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
-    
+
     ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
     ;; Reduces DB calls if asset is requested often. Default value 0 will always update access time
     ;DaysBetweenAccessTimeUpdates = 30
-    
+
+    ;; Should FSAssets print read/write stats to the robust console, default is true
+    ;ShowConsoleStats = true
+
     ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
     ;StorageProvider = ""
     ;ConnectionString = ""
     ;Realm = "fsassets"
-    
+
     ;; The following are common to both the default asset service and FSAsset service
-    
-    ;; Default loader for loading default assets from XML on first run
+
+    ;; Common asset service options
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
 
@@ -262,7 +267,7 @@
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
     ;;
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
     ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
@@ -309,18 +314,19 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
 
 
 ; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. 
+; * is implemented.
 ; *
 [AuthenticationService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    ; Realm = "auth"
 
     ;; Allow the service to process HTTP getauthinfo calls.
     ;; Default is false.
@@ -341,15 +347,15 @@
     UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 
-; * This is the new style authentication service. Currently, only MySQL
-; * is implemented. "Realm" is the table that is used for user lookup.
+; * This is the new style user service.
+; * "Realm" is the table that is used for user lookup.
 ; * It defaults to "useraccounts", which uses the new style.
 ; * Realm = "users" will use the legacy tables as an authentication source
 ; *
 [UserAccountService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; Realm = "useraccounts"
+    ; Realm = "UserAccounts"
 
     ; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -359,7 +365,7 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
-    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
     CreateDefaultAvatarEntries = true
@@ -386,10 +392,6 @@
 [PresenceService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
-    ; Set this to true to allow the use of advanced web services and multiple
-    ; bots using one account
-    AllowDuplicatePresences = false;
-
 
 [AvatarService]
     ; for the server connector
@@ -453,21 +455,12 @@
     ; HasProxy = false
 
     ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
-    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
-    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
-    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
-    ;;   default    let OpenSim calculate US Pacific DST
-    ;;   "none"     disable DST (equivallent to "local" with system set to GMT)
-    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
-    ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
-
-    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
     ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
     ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
     ;; Options are
-    ;;   "none"     no DST 
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -488,7 +481,7 @@
     ;;
     ;; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ;DOSForgiveClientAfterMS = 120000
-    ;; 
+    ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 
@@ -506,16 +499,6 @@
     ; HasProxy = false
 
 
-[Messaging]
-    ; OfflineIM
-    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
-
-
-[Groups]
-    ;; Sets the maximum number of groups an agent may join
-    ; MaxAgentGroups = 42
-
-
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
     ; Client launcher scripts and third-party clients make use of this to
@@ -556,6 +539,16 @@
     ;password = ${Const|BaseURL}/password
 
 
+[Messaging]
+    ; OfflineIM
+    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
+
+
+[Groups]
+    ;; Sets the maximum number of groups an agent may join
+    ; MaxAgentGroups = 42
+
+
 [UserProfilesService]
     LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
     Enabled = false
@@ -570,3 +563,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"