Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 48 insertions, 52 deletions

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"