Merge branch 'master' into httptests

3 files changed, 70 insertions, 39 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa491fc..0203300 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1649,9 +1649,6 @@
     ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay V3 if true
     DetectExitHitsInLlCastRay = false
 
-    ; Filter on parts instead of groups in llCastRay V3 if true
-    FilterPartsInLlCastRay = false
-
     ; Detect attachments in llCastRay V3 if true
     DoAttachmentsInLlCastRay = false
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0382d4b..84cce86 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -58,7 +58,7 @@
     ; Modular configurations
     ; Set path to directory for modular ini files...
     ; The Robust.exe process must have R/W access to the location 
-    ConfigDirectory = "."
+    ConfigDirectory = "robust-include"
 
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
     ConsoleHistoryFileEnabled = true
@@ -102,7 +102,13 @@
     ;; Uncomment this if you want Groups V2 to work
     ; 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"
+
+    ;; Uncomment if you want to have centralized estate data
+    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
     ;; Additions for Hypergrid
 
@@ -116,12 +122,6 @@
     ;; 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"
-
-    ;; 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
 ; *
@@ -264,6 +264,18 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
 
+    ; Allow maptile assets to remotely deleted by remote calls to the asset service.
+    ; There is no harm in having this as false - it just means that historical maptile assets are not deleted.
+    ; This only applies to maptiles served via the version 1 viewer mechanisms
+    ; Default is false
+    AllowRemoteDelete = false
+
+    ; Allow all assets to be remotely deleted.
+    ; Only set this to true if you are operating a grid where you control all calls to the asset service
+    ; (where a necessary condition is that you control all simulators) and you need this for admin purposes.
+    ; If set to true, AllowRemoteDelete = true is required as well.
+    ; Default is false.
+    AllowRemoteDeleteAllTypes = false
 
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
@@ -315,6 +327,7 @@
     ;;  
     ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
     ;;
+    ;; Example specification:
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
     ; (replace spaces with underscore)
 
@@ -439,6 +452,9 @@
     ; 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
@@ -470,14 +486,21 @@
     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"
+    ;; end hypergrid
 
-    ;; Ask co-operative viewers to use a different currency name
+    ; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
     ;; Set minimum fee to publish classified
@@ -525,6 +548,24 @@
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
     DSTZone = "America/Los_Angeles;Pacific Standard Time"
 
+    ;Basic Login Service Dos Protection Tweaks
+    ;;
+    ;; Some Grids/Users use a transparent proxy that makes use of the X-Forwarded-For HTTP Header, If you do, set this to true
+    ;; If you set this to true and you don't have a transparent proxy, it may allow attackers to put random things in the X-Forwarded-For header to
+    ;;     get around this basic DOS protection.
+    ;DOSAllowXForwardedForHeader = false
+    ;;
+    ;; The protector adds up requests during this rolling period of time, default 10 seconds
+    ;DOSRequestTimeFrameMS = 10000
+    ;;
+    ;; The amount of requests in the above timeframe from the same endpoint that triggers protection
+    ;DOSMaxRequestsInTimeFrame = 5
+    ;;
+    ;; 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.
+
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
@@ -757,6 +798,7 @@
     ;; What is the HomeURI of users associated with this grid?
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; end hypergrid
 
     ;; Sets the maximum number of groups an agent may join
     ; MaxAgentGroups = 42
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 51cf9d8..2263780 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -50,7 +50,7 @@
     ; Modular configurations
     ; Set path to directory for modular ini files...
     ; The Robust.exe process must have R/W access to the location 
-    ConfigDirectory = "."
+    ConfigDirectory = "robust-include"
     
     ; Console commands can be saved to a file, so the command history persists after a restart. (default is true)
     ConsoleHistoryFileEnabled = true
@@ -89,11 +89,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"
@@ -222,7 +222,7 @@
     
     ;; 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"
 
@@ -332,6 +332,7 @@
 [AuthenticationService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    ; Realm = "useraccounts"
 
     ;; Allow the service to process HTTP getauthinfo calls.
     ;; Default is false.
@@ -352,8 +353,8 @@
     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
 ; *
@@ -464,15 +465,6 @@
     ; 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.
@@ -517,16 +509,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
@@ -567,6 +549,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