5 files changed, 85 insertions, 14 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..ef8008c 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,21 @@
 [Modules]
    AssetServices = "RemoteAssetServicesConnector"
    InventoryServices = "RemoteInventoryServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
    GridServices = "RemoteGridServicesConnector"
-    NeighbourServiceInConnector = true
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthorizationServices = "RemoteAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
    LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        ; for the LocalGridServicesConnector which is used by the Remote one
+    ; for the LocalGridServicesConnector which is used by the Remote one
    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    
-\ No newline at end of file
+    
+; Temporary...
+[Communications]
+    InterregionComms = "LocalComms"
+\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..6a65523 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,24 @@
    ;
    GridServerURI = "http://mygridserver.com:8003"
+[PresenceService]
+    ;
+    ; change this to your grid-wide presence server
+    ;
+    PresenceServerURI = "http://mygridserver.com:8003"
+[UserAccountService]
+    ;
+    ; change this to your grid-wide user accounts server
+    ;
+    UserAccountServerURI = "http://mygridserver.com:8003"
+[AuthenticationService]
+    ;
+    ; change this to your grid-wide authentication server
+    ;
+    AuthenticationServerURI = "http://mygridserver.com:8003"
 [Modules]
    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
    ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..512e88f 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,12 +13,21 @@
 [Modules]
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
    GridServices = "HGGridServicesConnector"
-    NeighbourServiceInConnector = true
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
    LandServiceInConnector = true
+    NeighbourServiceInConnector = true
    HypergridServiceInConnector = true
-    LLProxyLoginModule = true
+    SimulationServiceInConnector = true
+    InventoryServiceInConnector = false
+    AssetServiceInConnector = false
+    LibraryModule = false
+    LLLoginServiceInConnector = false
 [AssetService]
    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -30,8 +39,12 @@
 [GridService]
    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+    GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
        ; which in turn uses this
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+; Temporary...
+[Communications]
+    InterregionComms = "LocalComms"
+\ No newline at end of file
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..e881e30 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,8 @@
    NeighbourServices = "LocalNeighbourServicesConnector"
    AuthorizationServices = "LocalAuthorizationServicesConnector"
    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
    LibraryModule = true
 [AssetService]
@@ -28,3 +30,8 @@
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
    Realm = "regions"
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..5e54cde 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -14,14 +14,19 @@
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
    AuthorizationServices = "LocalAuthorizationServicesConnector"
    GridServices = "HGGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
    InventoryServiceInConnector = true
    AssetServiceInConnector = true
    HGAuthServiceInConnector = true
    HypergridServiceInConnector = true
    NeighbourServiceInConnector = true
    LibraryModule = true
+    LLLoginServiceInConnector = true
 [AssetService]
    ; For the AssetServiceInConnector
@@ -39,12 +44,16 @@
    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
 [AuthorizationService]
    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 [AuthenticationService]
-    ; For the HGAuthServiceInConnector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
    
 [GridService]
    ; for the HGGridServicesConnector to instantiate
@@ -52,3 +61,21 @@
        ; LocalGridServicesConnector needs this
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
        Realm = "regions"
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    
+    DefaultRegion = "OpenSim Test"
+    WelcomeMessage = "Welcome, Avatar!"
+

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5b19130..ef8008c 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -10,15 +10,21 @@
10	[Modules]	10	[Modules]
11	AssetServices = "RemoteAssetServicesConnector"	11	AssetServices = "RemoteAssetServicesConnector"
12	InventoryServices = "RemoteInventoryServicesConnector"	12	InventoryServices = "RemoteInventoryServicesConnector"
13	AuthorizationServices = "RemoteAuthorizationServicesConnector"
14	NeighbourServices = "RemoteNeighbourServicesConnector"
15	GridServices = "RemoteGridServicesConnector"	13	GridServices = "RemoteGridServicesConnector"
16	NeighbourServiceInConnector = true	14	NeighbourServices = "RemoteNeighbourServicesConnector"
		15	AuthorizationServices = "RemoteAuthorizationServicesConnector"
		16	PresenceServices = "RemotePresenceServicesConnector"
		17	UserAccountServices = "RemoteUserAccountServicesConnector"
		18	SimulationServices = "RemoteSimulationConnectorModule"
17	LandServiceInConnector = true	19	LandServiceInConnector = true
18	LLProxyLoginModule = true	20	NeighbourServiceInConnector = true
		21	SimulationServiceInConnector = true
19		22
20	[GridService]	23	[GridService]
21	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	24	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
22	; for the LocalGridServicesConnector which is used by the Remote one	25	; for the LocalGridServicesConnector which is used by the Remote one
23	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	26	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
24	\ No newline at end of file	27
		28	; Temporary...
		29	[Communications]
		30	InterregionComms = "LocalComms" \ No newline at end of file


diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 6da0f1e..6a65523 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,24 @@
21	;	21	;
22	GridServerURI = "http://mygridserver.com:8003"	22	GridServerURI = "http://mygridserver.com:8003"
23		23
		24	[PresenceService]
		25	;
		26	; change this to your grid-wide presence server
		27	;
		28	PresenceServerURI = "http://mygridserver.com:8003"
		29
		30	[UserAccountService]
		31	;
		32	; change this to your grid-wide user accounts server
		33	;
		34	UserAccountServerURI = "http://mygridserver.com:8003"
		35
		36	[AuthenticationService]
		37	;
		38	; change this to your grid-wide authentication server
		39	;
		40	AuthenticationServerURI = "http://mygridserver.com:8003"
		41
24	[Modules]	42	[Modules]
25	;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.	43	;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
26	;; Copy the config .example file into your own .ini file and change configs there	44	;; Copy the config .example file into your own .ini file and change configs there


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index a5fe6e9..512e88f 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -13,12 +13,21 @@
13	[Modules]	13	[Modules]
14	AssetServices = "HGAssetBroker"	14	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	15	InventoryServices = "HGInventoryBroker"
16	NeighbourServices = "RemoteNeighbourServicesConnector"
17	GridServices = "HGGridServicesConnector"	16	GridServices = "HGGridServicesConnector"
18	NeighbourServiceInConnector = true	17	NeighbourServices = "RemoteNeighbourServicesConnector"
		18	AuthenticationServices = "RemoteAuthenticationServicesConnector"
		19	AuthorizationServices = "LocalAuthorizationServicesConnector"
		20	PresenceServices = "RemotePresenceServicesConnector"
		21	UserAccountServices = "RemoteUserAccountServicesConnector"
		22	SimulationServices = "RemoteSimulationConnectorModule"
19	LandServiceInConnector = true	23	LandServiceInConnector = true
		24	NeighbourServiceInConnector = true
20	HypergridServiceInConnector = true	25	HypergridServiceInConnector = true
21	LLProxyLoginModule = true	26	SimulationServiceInConnector = true
		27	InventoryServiceInConnector = false
		28	AssetServiceInConnector = false
		29	LibraryModule = false
		30	LLLoginServiceInConnector = false
22		31
23	[AssetService]	32	[AssetService]
24	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	33	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -30,8 +39,12 @@
30		39
31	[GridService]	40	[GridService]
32	; for the HGGridServicesConnector to instantiate	41	; for the HGGridServicesConnector to instantiate
33	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"	42	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
34	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,	43	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
35	; which in turn uses this	44	; which in turn uses this
36	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	45	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
37	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	46	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
		47
		48	; Temporary...
		49	[Communications]
		50	InterregionComms = "LocalComms" \ No newline at end of file


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index cdfdf4b..e881e30 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,8 @@
13	NeighbourServices = "LocalNeighbourServicesConnector"	13	NeighbourServices = "LocalNeighbourServicesConnector"
14	AuthorizationServices = "LocalAuthorizationServicesConnector"	14	AuthorizationServices = "LocalAuthorizationServicesConnector"
15	GridServices = "LocalGridServicesConnector"	15	GridServices = "LocalGridServicesConnector"
		16	PresenceServices = "LocalPresenceServicesConnector"
		17	UserAccountServices = "LocalUserAccountServicesConnector"
16	LibraryModule = true	18	LibraryModule = true
17		19
18	[AssetService]	20	[AssetService]
@@ -28,3 +30,8 @@
28	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	30	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29	Realm = "regions"	31	Realm = "regions"
30		32
		33	[PresenceService]
		34	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		35
		36	[UserAccountService]
		37	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 909286c..5e54cde 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -14,14 +14,19 @@
14	AssetServices = "HGAssetBroker"	14	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	15	InventoryServices = "HGInventoryBroker"
16	NeighbourServices = "RemoteNeighbourServicesConnector"	16	NeighbourServices = "RemoteNeighbourServicesConnector"
		17	AuthenticationServices = "LocalAuthenticationServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	18	AuthorizationServices = "LocalAuthorizationServicesConnector"
18	GridServices = "HGGridServicesConnector"	19	GridServices = "HGGridServicesConnector"
		20	PresenceServices = "LocalPresenceServicesConnector"
		21	UserAccountServices = "LocalUserAccountServicesConnector"
		22	SimulationServices = "RemoteSimulationConnectorModule"
19	InventoryServiceInConnector = true	23	InventoryServiceInConnector = true
20	AssetServiceInConnector = true	24	AssetServiceInConnector = true
21	HGAuthServiceInConnector = true	25	HGAuthServiceInConnector = true
22	HypergridServiceInConnector = true	26	HypergridServiceInConnector = true
23	NeighbourServiceInConnector = true	27	NeighbourServiceInConnector = true
24	LibraryModule = true	28	LibraryModule = true
		29	LLLoginServiceInConnector = true
25		30
26	[AssetService]	31	[AssetService]
27	; For the AssetServiceInConnector	32	; For the AssetServiceInConnector
@@ -39,12 +44,16 @@
39	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	44	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
40	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	45	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
41		46
		47	[LibraryService]
		48	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		49	LibraryName = "OpenSim Library"
		50	DefaultLibrary = "./inventory/Libraries.xml"
		51
42	[AuthorizationService]	52	[AuthorizationService]
43	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	53	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
44		54
45	[AuthenticationService]	55	[AuthenticationService]
46	; For the HGAuthServiceInConnector	56	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
47	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
48		57
49	[GridService]	58	[GridService]
50	; for the HGGridServicesConnector to instantiate	59	; for the HGGridServicesConnector to instantiate
@@ -52,3 +61,21 @@
52	; LocalGridServicesConnector needs this	61	; LocalGridServicesConnector needs this
53	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	62	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54	Realm = "regions"	63	Realm = "regions"
		64
		65	[PresenceService]
		66	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		67
		68	[UserAccountService]
		69	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		70
		71	[LoginService]
		72	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		73	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		74	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		75	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		76	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		77	GridService = "OpenSim.Services.GridService.dll:GridService"
		78
		79	DefaultRegion = "OpenSim Test"
		80	WelcomeMessage = "Welcome, Avatar!"
		81