1 files changed, 20 insertions, 18 deletions

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 98e37e3..9897149 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -72,23 +72,6 @@
         
         AllowHypergridMapSearch = true
         
-[HypergridService]
-        GridService = "OpenSim.Services.GridService.dll:GridService"
-        AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-
-[GatekeeperService]
-    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-        ;; for the service
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
-    ; how does the outside world reach me? This acts as public key too.
-    ExternalName = "http://127.0.0.1:9000"
-
-[HGEntityTransferModule]
-        HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService"
-        
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
@@ -100,9 +83,11 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+
 [LoginService]
     LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -113,7 +98,24 @@
     WelcomeMessage = "Welcome, Avatar!"
     
     HomeURI = "http://127.0.0.1:9000"
-    GatewayURI = "http://127.0.0.1:9000"
+    GatekeeperURI = "http://127.0.0.1:9000"
     InventoryServerURI = "http://127.0.0.1:9000"
     AssetServerURI = "http://127.0.0.1:9000"
 
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+        ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.Hypergrid.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    ; how does the outside world reach me? This acts as public key too.
+    ExternalName = "http://127.0.0.1:9000"
+
+[UserAgentService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        ;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+