2 files changed, 25 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0195c03..aaa318c 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -56,6 +56,9 @@
        <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
        <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
        <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
+        
+        <RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
+        
        <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
        <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
      <!-- Service connectors IN modules -->
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 54e11af..92c2154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
 ;;
 [Modules]
-    AssetServices = "LocalAssetServicesConnector"
+    AssetServices           = "LocalAssetServicesConnector"
-    InventoryServices = "LocalInventoryServicesConnector"
+    InventoryServices       = "LocalInventoryServicesConnector"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
-    SimulationServices = "LocalSimulationConnectorModule"
+    GridUserServices        = "LocalGridUserServicesConnector"
-    AvatarServices = "LocalAvatarServicesConnector"
+    SimulationServices      = "LocalSimulationConnectorModule"
-    EntityTransferModule = "BasicEntityTransferModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
-    InventoryAccessModule = "BasicInventoryAccessModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
    LibraryModule = true
    LLLoginServiceInConnector = true
@@ -57,6 +58,9 @@
    GridService = "OpenSim.Services.GridService.dll:GridService"
    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+[GridUserService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
 [FriendsService]
    LocalServiceModule = "OpenSim.Services.FriendsService.dll"
@@ -64,14 +68,14 @@
    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"
    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
    WelcomeMessage = "Welcome, Avatar!"

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 0195c03..aaa318c 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -56,6 +56,9 @@
56	<RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />	56	<RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
57	<RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />	57	<RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
58	<RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />	58	<RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
		59
		60	<RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
		61
59	<RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />	62	<RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
60	<RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />	63	<RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
61	<!-- Service connectors IN modules -->	64	<!-- Service connectors IN modules -->


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 54e11af..92c2154 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
5	;;	5	;;
6		6
7	[Modules]	7	[Modules]
8	AssetServices = "LocalAssetServicesConnector"	8	AssetServices = "LocalAssetServicesConnector"
9	InventoryServices = "LocalInventoryServicesConnector"	9	InventoryServices = "LocalInventoryServicesConnector"
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 = "LocalSimulationConnectorModule"	15	GridUserServices = "LocalGridUserServicesConnector"
16	AvatarServices = "LocalAvatarServicesConnector"	16	SimulationServices = "LocalSimulationConnectorModule"
17	EntityTransferModule = "BasicEntityTransferModule"	17	AvatarServices = "LocalAvatarServicesConnector"
18	InventoryAccessModule = "BasicInventoryAccessModule"	18	EntityTransferModule = "BasicEntityTransferModule"
		19	InventoryAccessModule = "BasicInventoryAccessModule"
19	LibraryModule = true	20	LibraryModule = true
20	LLLoginServiceInConnector = true	21	LLLoginServiceInConnector = true
21		22
@@ -57,6 +58,9 @@
57	GridService = "OpenSim.Services.GridService.dll:GridService"	58	GridService = "OpenSim.Services.GridService.dll:GridService"
58	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	59	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
59		60
		61	[GridUserService]
		62	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
		63
60	[FriendsService]	64	[FriendsService]
61	LocalServiceModule = "OpenSim.Services.FriendsService.dll"	65	LocalServiceModule = "OpenSim.Services.FriendsService.dll"
62		66
@@ -64,14 +68,14 @@
64	Connector = "OpenSim.Services.FriendsService.dll"	68	Connector = "OpenSim.Services.FriendsService.dll"
65		69
66	[LoginService]	70	[LoginService]
67	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"	71	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
68	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	72	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
69	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	73	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
70	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	74	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
71	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	75	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
72	GridService = "OpenSim.Services.GridService.dll:GridService"	76	GridService = "OpenSim.Services.GridService.dll:GridService"
73	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"	77	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
74	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"	78	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
75		79
76	WelcomeMessage = "Welcome, Avatar!"	80	WelcomeMessage = "Welcome, Avatar!"
77		81