1 files changed, 34 insertions, 31 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 35e6f20..130e210 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,25 +5,27 @@
 ;;
        
 [Modules]
-    AssetServices = "HGAssetBroker"
+    AssetServices                       = "HGAssetBroker"
-    InventoryServices = "HGInventoryBroker"
+    InventoryServices           = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices           = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
+    AuthenticationServices      = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
+    GridServices                        = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
+    PresenceServices            = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
+    UserAccountServices         = "LocalUserAccountServicesConnector"
-    SimulationServices = "RemoteSimulationConnectorModule"
+    GridUserServices        = "LocalGridUserServicesConnector"
-    AvatarServices = "LocalAvatarServicesConnector"
+    SimulationServices          = "RemoteSimulationConnectorModule"
-    EntityTransferModule = "HGEntityTransferModule"
+    AvatarServices                      = "LocalAvatarServicesConnector"
-    InventoryAccessModule = "HGInventoryAccessModule"
+    EntityTransferModule        = "HGEntityTransferModule"
-    InventoryServiceInConnector = true
+    InventoryAccessModule       = "HGInventoryAccessModule"
-    AssetServiceInConnector = true
+    
-    HypergridServiceInConnector = true
+    InventoryServiceInConnector                 = true
-    NeighbourServiceInConnector = true
+    AssetServiceInConnector                             = true
-    LibraryModule = true
+    HypergridServiceInConnector                 = true
-    LLLoginServiceInConnector = true
+    NeighbourServiceInConnector                 = true
-    AuthenticationServiceInConnector = true
+    LibraryModule                                               = true
-    SimulationServiceInConnector = true
+    LLLoginServiceInConnector                   = true
+    AuthenticationServiceInConnector    = true
+    SimulationServiceInConnector                = true
 [AssetService]
    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
@@ -68,10 +70,10 @@
 [UserAccountService]
    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
    ;; These are for creating new accounts by the service
    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
@@ -83,15 +85,16 @@
    Connector = "OpenSim.Services.FriendsService.dll"
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
-    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+        UserAgentService                = "OpenSim.Services.HypergridService.dll:UserAgentService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    GridService                         = "OpenSim.Services.GridService.dll:GridService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
    
 [GatekeeperService]
    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -106,7 +109,7 @@
 [UserAgentService]
        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
        ;; for the service
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
        
 ;; The interface that local users get when they are in other grids

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 35e6f20..130e210 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,25 +5,27 @@
5	;;	5	;;
6		6
7	[Modules]	7	[Modules]
8	AssetServices = "HGAssetBroker"	8	AssetServices = "HGAssetBroker"
9	InventoryServices = "HGInventoryBroker"	9	InventoryServices = "HGInventoryBroker"
10	NeighbourServices = "LocalNeighbourServicesConnector"	10	NeighbourServices = "LocalNeighbourServicesConnector"
11	AuthenticationServices = "LocalAuthenticationServicesConnector"	11	AuthenticationServices = "LocalAuthenticationServicesConnector"
12	GridServices = "LocalGridServicesConnector"	12	GridServices = "LocalGridServicesConnector"
13	PresenceServices = "LocalPresenceServicesConnector"	13	PresenceServices = "LocalPresenceServicesConnector"
14	UserAccountServices = "LocalUserAccountServicesConnector"	14	UserAccountServices = "LocalUserAccountServicesConnector"
15	SimulationServices = "RemoteSimulationConnectorModule"	15	GridUserServices = "LocalGridUserServicesConnector"
16	AvatarServices = "LocalAvatarServicesConnector"	16	SimulationServices = "RemoteSimulationConnectorModule"
17	EntityTransferModule = "HGEntityTransferModule"	17	AvatarServices = "LocalAvatarServicesConnector"
18	InventoryAccessModule = "HGInventoryAccessModule"	18	EntityTransferModule = "HGEntityTransferModule"
19	InventoryServiceInConnector = true	19	InventoryAccessModule = "HGInventoryAccessModule"
20	AssetServiceInConnector = true	20
21	HypergridServiceInConnector = true	21	InventoryServiceInConnector = true
22	NeighbourServiceInConnector = true	22	AssetServiceInConnector = true
23	LibraryModule = true	23	HypergridServiceInConnector = true
24	LLLoginServiceInConnector = true	24	NeighbourServiceInConnector = true
25	AuthenticationServiceInConnector = true	25	LibraryModule = true
26	SimulationServiceInConnector = true	26	LLLoginServiceInConnector = true
		27	AuthenticationServiceInConnector = true
		28	SimulationServiceInConnector = true
27		29
28	[AssetService]	30	[AssetService]
29	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	31	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -68,10 +70,10 @@
68		70
69	[UserAccountService]	71	[UserAccountService]
70	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"	72	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
71	ConnectionString = "URI=file:userprofiles.db,version=3"	73
72	;; These are for creating new accounts by the service	74	;; These are for creating new accounts by the service
73	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	75	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	76	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
75	GridService = "OpenSim.Services.GridService.dll:GridService"	77	GridService = "OpenSim.Services.GridService.dll:GridService"
76	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	78	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
77		79
@@ -83,15 +85,16 @@
83	Connector = "OpenSim.Services.FriendsService.dll"	85	Connector = "OpenSim.Services.FriendsService.dll"
84		86
85	[LoginService]	87	[LoginService]
86	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"	88	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
87	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	89	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
88	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"	90	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
89	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	91	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
90	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	92	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
91	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	93	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
92	GridService = "OpenSim.Services.GridService.dll:GridService"	94	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
93	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"	95	GridService = "OpenSim.Services.GridService.dll:GridService"
94	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"	96	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
		97	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
95		98
96	[GatekeeperService]	99	[GatekeeperService]
97	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"	100	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -106,7 +109,7 @@
106	[UserAgentService]	109	[UserAgentService]
107	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"	110	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
108	;; for the service	111	;; for the service
109	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	112	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
110	GridService = "OpenSim.Services.GridService.dll:GridService"	113	GridService = "OpenSim.Services.GridService.dll:GridService"
111		114
112	;; The interface that local users get when they are in other grids	115	;; The interface that local users get when they are in other grids