Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index aed1d33..a23063d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -146,6 +146,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     ; Realm = "useraccounts"
 
+    ;; Allow the service to process HTTP getauthinfo calls.
+    ;; Default is false.
+    ; AllowGetAuthInfo = false
+
+    ;; Allow the service to process HTTP setauthinfo calls.
+    ;; Default is false.
+    ; AllowSetAuthInfo = false
+
     ;; Allow the service to process HTTP setpassword calls.
     ;; Default is false.
     ; AllowSetPassword = false