6 files changed, 141 insertions, 47 deletions

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index f3d222f..b93bbd6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -1,21 +1,22 @@
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
 ; * Multiple connectors should be seaprated by commas.
+; * The startup section lists all the connectors to start up in this server
+; * instance. This may be only one, or it may be the entire server suite.
+; * Multiple connectors should be seaprated by commas.
 ; *
 ; * These are the IN connectors the server uses, the in connectors
-; * read this config file and load the needed OUT and database connectors
+; * read this config file and load the needed service and database connectors
 ; *
-; * Add "OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" to
-; * enable the experimental authentication service
 ; *
 [Startup]
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector"
+ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,,OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance
 ; *
 [Network]
-port = 8003
+    port = 8003
 
 ; * The following are for the remote console
 ; * They have no effect for the local or basic console types
@@ -29,25 +30,35 @@ port = 8003
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-AssetLoaderArgs = "assets/AssetSets.xml"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
 
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
 ; *
 [InventoryService]
-LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-UserServerURI = "http://127.0.0.1:8002"
-SessionAuthentication = "false"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    UserServerURI = "http://127.0.0.1:8002"
+    SessionAuthentication = "false"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
+; * This is the new style grid service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "regions", which uses the legacy tables
+; *
+[GridService]
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+    Realm = "regions"
 
 ; * This is the configuration for the freeswitch server in grid mode
 [FreeswitchService]
-LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
 
 ; * This is the new style authentication service. Currently, only MySQL
 ; * is implemented. "Realm" is the table that is used for user lookup.
@@ -55,27 +66,39 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
 ; * as an authentication source.
 ; *
 [AuthenticationService]
-AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
-; Realm = "users"
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
 
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
 ; * It defaults to "users", which uses the legacy tables
 ; *
 [UserAccountService]
-AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
-; Realm = "users"
+    AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+    ; Realm = "useraccounts"
 
-; * This is the new style grid service.
-; * "Realm" is the table that is used for user lookup.
-; * It defaults to "regions", which uses the legacy tables
-; *
-[GridService]
-LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
-ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
-Realm = "regions"
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
+[LibraryService]
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
+[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"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
+
+    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 @@
 [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"
-        ; 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
+    
+; 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:HGAuthenticationService"
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     
 [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!"
+