6 files changed, 194 insertions, 32 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..56c76c6 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,27 @@
 [Modules]
    AssetServices = "RemoteAssetServicesConnector"
    InventoryServices = "RemoteInventoryServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
    GridServices = "RemoteGridServicesConnector"
-    NeighbourServiceInConnector = true
+    AvatarServices = "RemoteAvatarServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
    LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = 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
+    
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..a62868e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -20,6 +20,31 @@
    ; change this to your grid-wide grid server
    ;
    GridServerURI = "http://mygridserver.com:8003"
+    ;AllowHypergridMapSearch = true
+[AvatarService]
+    ;
+    ; change this to your grid-wide grid server
+    ;
+    AvatarServerURI = "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.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..7391278 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,18 +7,23 @@
 [Includes]
    Include-Common = "config-include/GridCommon.ini"
-[Startup]
-        hypergrid = true
 [Modules]
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
+    GridServices = "RemoteGridServicesConnector"
+    AvatarServices = "RemoteAvatarServicesConnector"
    NeighbourServices = "RemoteNeighbourServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    NeighbourServiceInConnector = true
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
    LandServiceInConnector = true
-    HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
-    LLProxyLoginModule = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
 [AssetService]
    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -29,9 +34,9 @@
    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        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"
+        AllowHypergridMapSearch = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..bd90df4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -11,9 +11,16 @@
    AssetServices = "LocalAssetServicesConnector"
    InventoryServices = "LocalInventoryServicesConnector"
    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "LocalSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
    LibraryModule = true
+    LLLoginServiceInConnector = true
 [AssetService]
    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,10 +28,47 @@
 [InventoryService]
    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
    
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 [AuthorizationService]
    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+[AuthenticationService]
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    StorageProvider = "OpenSim.Data.Null.dll"
 [GridService]
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
    Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+    ;; These are for creating new accounts
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    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"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    WelcomeMessage = "Welcome, Avatar!"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1679f93..8e21a8c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,7 +39,23 @@
    ;;--- For MySql region storage (alternative)
        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;; Next, we can specify properties of regions, including default and fallback regions
+    ;; The syntax is: Region_<RegioName> = "<flags>"
+    ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;; For example:
+    Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 [LibraryModule]
    ; Set this if you want to change the name of the OpenSim Library
-    ;LibraryName = "My World's Library"
-\ No newline at end of file
+    ;LibraryName = "My World's Library"
+    
+[LoginService]
+    WelcomeMessage = "Welcome, Avatar!"
+    HomeURI = "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]
+    ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..a4fa5be 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -6,25 +6,30 @@
 [Includes]
    Include-Common = "config-include/StandaloneCommon.ini"
-[Startup]
-        hypergrid = true
        
 [Modules]
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
    InventoryServiceInConnector = true
    AssetServiceInConnector = true
    HGAuthServiceInConnector = true
    HypergridServiceInConnector = true
    NeighbourServiceInConnector = true
    LibraryModule = true
+    LLLoginServiceInConnector = true
+    AuthenticationServiceInConnector = true
+    SimulationServiceInConnector = true
 [AssetService]
-    ; For the AssetServiceInConnector
    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
    ; For HGAssetBroker
@@ -32,23 +37,78 @@
    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 [InventoryService]
-    ; For the InventoryServiceInConnector
    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
    ; For HGInventoryBroker
    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[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"
+    StorageProvider = "OpenSim.Data.Null.dll"
-    
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
        ; LocalGridServicesConnector needs this
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
        Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+        
+        AllowHypergridMapSearch = true
+        
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    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"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+        ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.HypergridService.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.
+[UserAgentService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        ;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+        
+;; The interface that local users get when they are in other grids
+;; This greatly restricts the inventory operations while in other grids
+[HGInventoryService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5b19130..56c76c6 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -10,15 +10,27 @@
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	AvatarServices = "RemoteAvatarServicesConnector"
		15	NeighbourServices = "RemoteNeighbourServicesConnector"
		16	AuthenticationServices = "RemoteAuthenticationServicesConnector"
		17	PresenceServices = "RemotePresenceServicesConnector"
		18	UserAccountServices = "RemoteUserAccountServicesConnector"
		19	SimulationServices = "RemoteSimulationConnectorModule"
		20	EntityTransferModule = "BasicEntityTransferModule"
		21	InventoryAccessModule = "BasicInventoryAccessModule"
17	LandServiceInConnector = true	22	LandServiceInConnector = true
18	LLProxyLoginModule = true	23	NeighbourServiceInConnector = true
		24	SimulationServiceInConnector = true
		25	LibraryModule = true
		26
19		27
20	[GridService]	28	[GridService]
21	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	29	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
22	; for the LocalGridServicesConnector which is used by the Remote one	30	; for the LocalGridServicesConnector which is used by the Remote one
23	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	31	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
24	\ No newline at end of file	32
		33	[LibraryService]
		34	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		35	LibraryName = "OpenSim Library"
		36	DefaultLibrary = "./inventory/Libraries.xml"


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


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index a5fe6e9..7391278 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -7,18 +7,23 @@
7	[Includes]	7	[Includes]
8	Include-Common = "config-include/GridCommon.ini"	8	Include-Common = "config-include/GridCommon.ini"
9		9
10	[Startup]
11	hypergrid = true
12
13	[Modules]	10	[Modules]
14	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
		13	GridServices = "RemoteGridServicesConnector"
		14	AvatarServices = "RemoteAvatarServicesConnector"
16	NeighbourServices = "RemoteNeighbourServicesConnector"	15	NeighbourServices = "RemoteNeighbourServicesConnector"
17	GridServices = "HGGridServicesConnector"	16	AuthenticationServices = "RemoteAuthenticationServicesConnector"
18	NeighbourServiceInConnector = true	17	AuthorizationServices = "LocalAuthorizationServicesConnector"
		18	PresenceServices = "RemotePresenceServicesConnector"
		19	UserAccountServices = "RemoteUserAccountServicesConnector"
		20	SimulationServices = "RemoteSimulationConnectorModule"
		21	EntityTransferModule = "HGEntityTransferModule"
		22	InventoryAccessModule = "HGInventoryAccessModule"
19	LandServiceInConnector = true	23	LandServiceInConnector = true
20	HypergridServiceInConnector = true	24	NeighbourServiceInConnector = true
21	LLProxyLoginModule = true	25	SimulationServiceInConnector = true
		26	LibraryModule = true
22		27
23	[AssetService]	28	[AssetService]
24	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	29	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -29,9 +34,9 @@
29	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	34	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
30		35
31	[GridService]	36	[GridService]
32	; for the HGGridServicesConnector to instantiate
33	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
34	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,	37	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
35	; which in turn uses this	38	; which in turn uses this
36	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	39	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
37	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	40	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
		41
		42	AllowHypergridMapSearch = true


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index cdfdf4b..bd90df4 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -11,9 +11,16 @@
11	AssetServices = "LocalAssetServicesConnector"	11	AssetServices = "LocalAssetServicesConnector"
12	InventoryServices = "LocalInventoryServicesConnector"	12	InventoryServices = "LocalInventoryServicesConnector"
13	NeighbourServices = "LocalNeighbourServicesConnector"	13	NeighbourServices = "LocalNeighbourServicesConnector"
14	AuthorizationServices = "LocalAuthorizationServicesConnector"	14	AuthenticationServices = "LocalAuthenticationServicesConnector"
15	GridServices = "LocalGridServicesConnector"	15	GridServices = "LocalGridServicesConnector"
		16	PresenceServices = "LocalPresenceServicesConnector"
		17	UserAccountServices = "LocalUserAccountServicesConnector"
		18	SimulationServices = "LocalSimulationConnectorModule"
		19	AvatarServices = "LocalAvatarServicesConnector"
		20	EntityTransferModule = "BasicEntityTransferModule"
		21	InventoryAccessModule = "BasicInventoryAccessModule"
16	LibraryModule = true	22	LibraryModule = true
		23	LLLoginServiceInConnector = true
17		24
18	[AssetService]	25	[AssetService]
19	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	26	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,10 +28,47 @@
21	[InventoryService]	28	[InventoryService]
22	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"	29	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
23		30
		31	[LibraryService]
		32	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		33	LibraryName = "OpenSim Library"
		34	DefaultLibrary = "./inventory/Libraries.xml"
		35
		36	[AvatarService]
		37	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
		38	StorageProvider = "OpenSim.Data.Null.dll"
		39
24	[AuthorizationService]	40	[AuthorizationService]
25	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	41	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
26		42
		43	[AuthenticationService]
		44	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		45	StorageProvider = "OpenSim.Data.Null.dll"
		46
27	[GridService]	47	[GridService]
28	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	48	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29	Realm = "regions"	49	Realm = "regions"
		50	StorageProvider = "OpenSim.Data.Null.dll"
		51
		52	[PresenceService]
		53	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		54	StorageProvider = "OpenSim.Data.Null.dll"
		55
		56	[UserAccountService]
		57	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		58	StorageProvider = "OpenSim.Data.Null.dll"
		59	;; These are for creating new accounts
		60	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		61	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		62	GridService = "OpenSim.Services.GridService.dll:GridService"
		63	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		64
		65	[LoginService]
		66	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		67	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		68	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		69	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		70	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		71	GridService = "OpenSim.Services.GridService.dll:GridService"
		72	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
30		73
		74	WelcomeMessage = "Welcome, Avatar!"


diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 1679f93..8e21a8c 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,7 +39,23 @@
39	;;--- For MySql region storage (alternative)	39	;;--- For MySql region storage (alternative)
40	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"	40	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
41	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"	41	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
		42	;; Next, we can specify properties of regions, including default and fallback regions
		43	;; The syntax is: Region_<RegioName> = "<flags>"
		44	;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
		45	;; For example:
		46	Region_Welcome_Area = "DefaultRegion, FallbackRegion"
42		47
43	[LibraryModule]	48	[LibraryModule]
44	; Set this if you want to change the name of the OpenSim Library	49	; Set this if you want to change the name of the OpenSim Library
45	;LibraryName = "My World's Library" \ No newline at end of file	50	;LibraryName = "My World's Library"
		51
		52	[LoginService]
		53	WelcomeMessage = "Welcome, Avatar!"
		54
		55	HomeURI = "http://127.0.0.1:9000"
		56	GatekeeperURI = "http://127.0.0.1:9000"
		57	InventoryServerURI = "http://127.0.0.1:9000"
		58	AssetServerURI = "http://127.0.0.1:9000"
		59
		60	[GatekeeperService]
		61	ExternalName = "http://127.0.0.1:9000"


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 909286c..a4fa5be 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -6,25 +6,30 @@
6		6
7	[Includes]	7	[Includes]
8	Include-Common = "config-include/StandaloneCommon.ini"	8	Include-Common = "config-include/StandaloneCommon.ini"
9
10	[Startup]
11	hypergrid = true
12		9
13	[Modules]	10	[Modules]
14	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
16	NeighbourServices = "RemoteNeighbourServicesConnector"	13	NeighbourServices = "LocalNeighbourServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	14	AuthenticationServices = "LocalAuthenticationServicesConnector"
18	GridServices = "HGGridServicesConnector"	15	GridServices = "LocalGridServicesConnector"
		16	PresenceServices = "LocalPresenceServicesConnector"
		17	UserAccountServices = "LocalUserAccountServicesConnector"
		18	SimulationServices = "RemoteSimulationConnectorModule"
		19	AvatarServices = "LocalAvatarServicesConnector"
		20	EntityTransferModule = "HGEntityTransferModule"
		21	InventoryAccessModule = "HGInventoryAccessModule"
19	InventoryServiceInConnector = true	22	InventoryServiceInConnector = true
20	AssetServiceInConnector = true	23	AssetServiceInConnector = true
21	HGAuthServiceInConnector = true	24	HGAuthServiceInConnector = true
22	HypergridServiceInConnector = true	25	HypergridServiceInConnector = true
23	NeighbourServiceInConnector = true	26	NeighbourServiceInConnector = true
24	LibraryModule = true	27	LibraryModule = true
		28	LLLoginServiceInConnector = true
		29	AuthenticationServiceInConnector = true
		30	SimulationServiceInConnector = true
25		31
26	[AssetService]	32	[AssetService]
27	; For the AssetServiceInConnector
28	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	33	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
29		34
30	; For HGAssetBroker	35	; For HGAssetBroker
@@ -32,23 +37,78 @@
32	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"	37	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
33		38
34	[InventoryService]	39	[InventoryService]
35	; For the InventoryServiceInConnector
36	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"	40	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
37		41
38	; For HGInventoryBroker	42	; For HGInventoryBroker
39	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	43	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
40	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	44	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
41		45
		46	[AvatarService]
		47	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
		48	StorageProvider = "OpenSim.Data.Null.dll"
		49
		50	[LibraryService]
		51	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		52	LibraryName = "OpenSim Library"
		53	DefaultLibrary = "./inventory/Libraries.xml"
		54
42	[AuthorizationService]	55	[AuthorizationService]
43	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	56	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
44		57
45	[AuthenticationService]	58	[AuthenticationService]
46	; For the HGAuthServiceInConnector	59	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
47	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"	60	StorageProvider = "OpenSim.Data.Null.dll"
48		61
49	[GridService]	62	[GridService]
50	; for the HGGridServicesConnector to instantiate
51	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
52	; LocalGridServicesConnector needs this	63	; LocalGridServicesConnector needs this
53	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	64	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54	Realm = "regions"	65	Realm = "regions"
		66	StorageProvider = "OpenSim.Data.Null.dll"
		67
		68	AllowHypergridMapSearch = true
		69
		70	[PresenceService]
		71	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		72	StorageProvider = "OpenSim.Data.Null.dll"
		73
		74	[UserAccountService]
		75	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		76	StorageProvider = "OpenSim.Data.Null.dll"
		77	;; These are for creating new accounts by the service
		78	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		79	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		80	GridService = "OpenSim.Services.GridService.dll:GridService"
		81	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		82
		83
		84	[LoginService]
		85	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		86	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		87	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		88	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		89	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		90	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		91	GridService = "OpenSim.Services.GridService.dll:GridService"
		92	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
		93
		94	[GatekeeperService]
		95	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
		96	;; for the service
		97	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		98	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		99	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		100	GridService = "OpenSim.Services.GridService.dll:GridService"
		101	AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
		102	; how does the outside world reach me? This acts as public key too.
		103
		104	[UserAgentService]
		105	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
		106	;; for the service
		107	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		108	GridService = "OpenSim.Services.GridService.dll:GridService"
		109
		110	;; The interface that local users get when they are in other grids
		111	;; This greatly restricts the inventory operations while in other grids
		112	[HGInventoryService]
		113	; For the InventoryServiceInConnector
		114	LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"