3 files changed, 19 insertions, 15 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9aaa46b..deceb86 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none if specified above
@@ -219,6 +219,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    
+    ;; If you separate the UserAgentService from the LoginService, set this to
+    ;; the IP address of the machine where your LoginService is
+    ;LoginServerIP = "127.0.0.1"
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the inventory operations while in other grids.
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..49ba2ca 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..9b27cc7 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
-    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
-    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
+    AssetServices = "SimianAssetServiceConnector"
+    InventoryServices = "SimianInventoryServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"