6 files changed, 138 insertions, 15 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..1a9ac72 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,26 @@
 [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"
+    AgentTransferModule = "AgentTransferModule"
     LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
+
 
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        ; for the LocalGridServicesConnector which is used by the Remote one
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; 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..4d94ccd 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,30 @@
     ;
     GridServerURI = "http://mygridserver.com:8003"
 
+[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.
     ;; 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..1275a60 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,12 +13,22 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
     GridServices = "HGGridServicesConnector"
-    NeighbourServiceInConnector = true
+    AvatarServices = "RemoteAvatarServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    AgentTransferModule = "AgentTransferModule"
     LandServiceInConnector = true
+    NeighbourServiceInConnector = true
     HypergridServiceInConnector = true
-    LLProxyLoginModule = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
+    InventoryServiceInConnector = false
+    AssetServiceInConnector = false
+    LLLoginServiceInConnector = false
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -30,8 +40,13 @@
 
 [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"
+
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..c9d483b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,7 +13,12 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "LocalSimulationConnectorModule"
+    AgentTransferModule = "AgentTransferModule"
     LibraryModule = true
+    LLLoginServiceInConnector = true
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,6 +26,11 @@
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
     
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
+
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
@@ -28,3 +38,23 @@
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
 
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ;; These are for creating new accounts
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+
+[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/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1679f93..0d54b4d 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -39,6 +39,11 @@
     ;;--- 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
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..20c5d10 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -14,14 +14,20 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
     GridServices = "HGGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    AgentTransferModule = "AgentTransferModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
     NeighbourServiceInConnector = true
     LibraryModule = true
+    LLLoginServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -39,12 +45,20 @@
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
 
+[AvatarService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+[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:HGAuthenticationService"
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     
 [GridService]
     ; for the HGGridServicesConnector to instantiate
@@ -52,3 +66,27 @@
         ; 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"
+    ;; 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"
+    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"
+    
+    DefaultRegion = "OpenSim Test"
+    WelcomeMessage = "Welcome, Avatar!"
+