Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 3 insertions, 1 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 22b39ce..6dbb611 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -970,7 +970,8 @@
 
     ;; This page should have Accept/Decline links somewhere
     ;; that affect the GridUsers table. If you don't have such
-    ;; script in place, don't use the TOSModule
+    ;; script in place, don't use the TOSModule. The TOSModule appends this URL
+        ;; with a query ?user={userid}&sid={sessionid}
     ;# {TOS_URL} {} {The URL for the TOS page} {}
     TOS_URL = "http://mygrid.com/tos"
 
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index b0ae351..76d588c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -130,6 +130,7 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"