From f43a64805251dfbb2e24abc481b8b59c062d452e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Dec 2009 09:22:35 -0800 Subject: * Added the new modules to Resources, making them active. * Added their configs to standalone for testing. This crashes, because the DB is still not ready. --- bin/config-include/Standalone.ini | 3 +++ bin/config-include/StandaloneHypergrid.ini | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index cdfdf4b..c4cffb9 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -13,6 +13,7 @@ NeighbourServices = "LocalNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "LocalGridServicesConnector" + PresenceServices ="LocalPresenceServicesConnector" LibraryModule = true [AssetService] @@ -28,3 +29,5 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" +[PresenceService] + LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 909286c..bd9de33 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -16,6 +16,7 @@ NeighbourServices = "RemoteNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "HGGridServicesConnector" + PresenceServices ="LocalPresenceServicesConnector" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true @@ -52,3 +53,6 @@ ; LocalGridServicesConnector needs this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" + +[PresenceService] + LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" -- cgit v1.1 From 88d2df597e499600357c86ad0b1a755a13e9c6b1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Dec 2009 16:34:02 -0800 Subject: * Fixed names. * Added configs for Standalone * Changed UserSericeBase to use useraccounts instead of user --- bin/config-include/Standalone.ini | 6 +++++- bin/config-include/StandaloneHypergrid.ini | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index c4cffb9..3eb68a0 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -13,7 +13,8 @@ NeighbourServices = "LocalNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "LocalGridServicesConnector" - PresenceServices ="LocalPresenceServicesConnector" + PresenceServices = "LocalPresenceServicesConnector" + UserAccountServices = "LocalUserAccountServicesConnector" LibraryModule = true [AssetService] @@ -31,3 +32,6 @@ [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + +[UserAccountService] + LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index bd9de33..4efc301 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -16,7 +16,8 @@ NeighbourServices = "RemoteNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "HGGridServicesConnector" - PresenceServices ="LocalPresenceServicesConnector" + PresenceServices = "LocalPresenceServicesConnector" + UserAccountServices = "LocalUserAccountServicesConnector" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true @@ -56,3 +57,6 @@ [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + +[UserAccountService] + LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" -- cgit v1.1 From be2f0336269e36fd987392209c8d5bf382a043f5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Dec 2009 17:21:16 -0800 Subject: More renames to make everything consistent. This is the UserAccountService. --- bin/config-include/Standalone.ini | 2 +- bin/config-include/StandaloneHypergrid.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 3eb68a0..e881e30 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -34,4 +34,4 @@ LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" [UserAccountService] - LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" + LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 4efc301..c3ed754 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -59,4 +59,4 @@ LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" [UserAccountService] - LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" + LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" -- cgit v1.1 From b29ae7246076126e8e39827564438db6e53eac8a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 30 Dec 2009 21:00:16 -0800 Subject: First pass at the new login service. Still incomplete, but doesn't disrupt the existing code. --- bin/config-include/StandaloneHypergrid.ini | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index c3ed754..7b1d43d 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -60,3 +60,11 @@ [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + +[LoginService] + LocalServiceModule = "OpenSim.Services.LLoginService.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" + -- cgit v1.1 From 1387919c204eb66ab6a37eb0fdf0f3c38f0a6813 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 31 Dec 2009 20:51:35 -0800 Subject: Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year... * HAPPY NEW YEAR! --- bin/config-include/StandaloneHypergrid.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 7b1d43d..ac514ba 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -24,6 +24,7 @@ HypergridServiceInConnector = true NeighbourServiceInConnector = true LibraryModule = true + LLLoginServiceInConnector = true [AssetService] ; For the AssetServiceInConnector @@ -62,7 +63,7 @@ LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" [LoginService] - LocalServiceModule = "OpenSim.Services.LLoginService.dll:LLLoginService" + LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" -- cgit v1.1 From 4240f2dec6f7348a99aea0d1b040fca6ea9d493b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 1 Jan 2010 16:54:24 -0800 Subject: New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing. --- bin/config-include/StandaloneHypergrid.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index ac514ba..6a9c3bf 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -14,6 +14,7 @@ AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" NeighbourServices = "RemoteNeighbourServicesConnector" + AuthenticationServices = "LocalAuthenticationServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "HGGridServicesConnector" PresenceServices = "LocalPresenceServicesConnector" @@ -46,8 +47,7 @@ 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 @@ -68,4 +68,5 @@ AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" -- cgit v1.1 From ec53301e637b479edc00526d3d946814f63a02d1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 1 Jan 2010 18:59:54 -0800 Subject: Forgotten modules in prior commit. --- bin/config-include/StandaloneHypergrid.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 6a9c3bf..96c25e6 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -70,3 +70,6 @@ PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" + DefaultRegion = "OpenSim Test" + WelcomeMessage = "Welcome, Avatar!" + -- cgit v1.1 From 8a9677a5319793ff630d0761e204ae8961f375aa Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 1 Jan 2010 21:12:46 -0800 Subject: The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible. --- bin/config-include/StandaloneHypergrid.ini | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 96c25e6..d89029f 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -43,6 +43,11 @@ 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" -- cgit v1.1 From c268e342d19b6cc5969b1c1d94f20a3f4eb844ef Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 3 Jan 2010 09:35:12 -0800 Subject: * Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle. * Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now. * Completed SimulationServiceConnector and corresponding handlers. --- bin/config-include/StandaloneHypergrid.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index d89029f..5e54cde 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -19,6 +19,7 @@ GridServices = "HGGridServicesConnector" PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" + SimulationServices = "RemoteSimulationConnectorModule" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true -- cgit v1.1 From 99efa99585639c94fdb484681663ac7b6f03538e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 3 Jan 2010 11:44:57 -0800 Subject: Successfully logged into a grid. --- bin/OpenSim.Server.ini.example | 89 +++++++++++++++++++------------ bin/config-include/GridCommon.ini.example | 18 +++++++ bin/config-include/GridHypergrid.ini | 19 +++++-- 3 files changed, 88 insertions(+), 38 deletions(-) (limited to 'bin') 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/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..94b9f69 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,8 @@ [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" -- cgit v1.1 From add8d5df4cbcb3301860fdabc3691232bbe598be Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 3 Jan 2010 20:06:06 -0800 Subject: Config for non-HG grided sims. --- bin/config-include/Grid.ini | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5b19130..0cc7f92 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -10,15 +10,18 @@ [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 -- cgit v1.1 From 1ac36bb5d9e6e67c2b157264aeeb397b9a1b55fd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 4 Jan 2010 07:45:20 -0800 Subject: Forgot to add these to the grid configs, so that logins work. --- bin/config-include/Grid.ini | 5 ++++- bin/config-include/GridHypergrid.ini | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 0cc7f92..ef8008c 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -24,4 +24,7 @@ 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/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 94b9f69..512e88f 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -44,3 +44,7 @@ ; which in turn uses this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + +; Temporary... +[Communications] + InterregionComms = "LocalComms" \ No newline at end of file -- cgit v1.1 From 96ecdcf9c5ba35e589a599ad37cc6ce1a83f46f1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 9 Jan 2010 18:04:50 -0800 Subject: * Added SetPassword to IAuthenticationService. * Added create user command to UserAccountService. Works. * Deleted create user command from OpenSim. --- bin/config-include/StandaloneHypergrid.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 5e54cde..feca115 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -67,7 +67,11 @@ [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" -- cgit v1.1 From 6998668bbcf6479f0ea0728024f24666c8cb0f8a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 14:12:03 -0800 Subject: * Last reference to CommsManager.UserProfileCacheService removed * Grided-sims added the Library module --- bin/config-include/Grid.ini | 2 ++ bin/config-include/GridHypergrid.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index ef8008c..ebddfd5 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -19,6 +19,8 @@ LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true + LibraryModule = true + [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 512e88f..5dadace 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -24,9 +24,9 @@ NeighbourServiceInConnector = true HypergridServiceInConnector = true SimulationServiceInConnector = true + LibraryModule = true InventoryServiceInConnector = false AssetServiceInConnector = false - LibraryModule = false LLLoginServiceInConnector = false [AssetService] -- cgit v1.1 From 3c90d834eac382af5edf091e83aea1ffcce91792 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 10 Jan 2010 22:41:42 +0000 Subject: Remove all references to master avatar, replacing with estate owner where appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. --- bin/RegionConfig.ini.example | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'bin') diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example index 8d833df..d45fe9d 100644 --- a/bin/RegionConfig.ini.example +++ b/bin/RegionConfig.ini.example @@ -20,17 +20,6 @@ AllowAlternatePorts = False ExternalHostName = "SYSTEMIP" ; * -; * Master avatar stuff. Set either a UUID (from OSGrid or your server) -; * OR a first and last name. Password is only needed for sandbox mode -; * The default assigns no master avatar -; * - -MasterAvatarUUID = "00000000-0000-0000-0000-000000000000" -; MasterAvatarFirstName = "" -; MasterAvatarLastName = "" -; MasterAvatarSandboxPassword = "" - -; * ; * Prim data ; * This allows limiting the sizes of prims and the region prim count ; * -- cgit v1.1 From 4dd523b45d1e635c66eb4e556764fabe29dbfc58 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 15:34:56 -0800 Subject: * Changed IPresenceService Logout, so that it takes a position and a lookat * CommsManager.AvatarService rerouted --- bin/config-include/Standalone.ini | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index e881e30..bf3237b 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -15,7 +15,9 @@ GridServices = "LocalGridServicesConnector" PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" + SimulationServices = "LocalSimulationConnectorModule" LibraryModule = true + LLLoginServiceInConnector = true [AssetService] LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" @@ -23,6 +25,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" @@ -35,3 +42,18 @@ [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!" -- cgit v1.1 From b0bbe861cd0f3eb06de73a371ab961428c549c69 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 17:15:02 -0800 Subject: Moved OpenId authentication from user server to Server.Handlers.Authentication. --- bin/OpenSim.Server.ini.example | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index b93bbd6..c76ac4d 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -10,7 +10,7 @@ ; * ; * [Startup] -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" +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:OpenIdServerConnector,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 @@ -66,17 +66,25 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S ; * as an authentication source. ; * [AuthenticationService] + ; for the server connector AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + ; for the service StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" +[OpenIdService] + ; for the server connector + AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + ; * 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" + ; for the server connector LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + ; for the service StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" ; Realm = "useraccounts" -- cgit v1.1 From eb6d49e02ca89aa8a834fc964881e30eb17251a4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 17:19:40 -0800 Subject: Fixed small inconsistency in config var name. --- bin/OpenSim.Server.ini.example | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index c76ac4d..1b5aef2 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -67,7 +67,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S ; * [AuthenticationService] ; for the server connector - AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" ; for the service StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" @@ -90,7 +90,9 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S ; Realm = "useraccounts" [PresenceService] + ; for the server connector LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + ; for the service StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" @@ -99,7 +101,9 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S DefaultLibrary = "./inventory/Libraries.xml" [LoginService] + ; for the server connector LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" + ; for the service UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" -- cgit v1.1 From 49618dc102c42b7125303511d826f76f0ebaab4c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 19:19:34 -0800 Subject: Moved GridInfo service from where it was to Handlers/Grid --- bin/OpenSim.Server.ini.example | 2 +- bin/OpenSim.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 1b5aef2..2ccc580 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -10,7 +10,7 @@ ; * ; * [Startup] -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:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,,OpenSim.Server.Handlers.dll:UserAccountServiceConnector" +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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,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 diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1cf96b0..971dfc4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -1033,7 +1033,7 @@ ; DisableUndergroundMovement = true -[GridInfo] +[GridInfoService] ; These settings are used to return information on a get_grid_info call. ; Client launcher scripts and third-party clients make use of this to ; autoconfigure the client and to provide a nice user experience. If you -- cgit v1.1 From 77e43f480154b0a950d9d5f54df5c225fc64e77a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 11 Jan 2010 17:30:05 -0800 Subject: Fixed a couple of bugs with Appearance. Appearance is all good now. --- bin/config-include/StandaloneHypergrid.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index feca115..277d05a 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -20,6 +20,7 @@ PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" + AvatarServices = "LocalAvatarServicesConnector"; InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true @@ -44,6 +45,10 @@ 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" @@ -79,6 +84,7 @@ 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!" -- cgit v1.1 From 66920a9047b54db947d02f252e17409b7fc32ef0 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 12 Jan 2010 09:22:58 -0800 Subject: Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be. --- bin/OpenSim.Server.ini.example | 10 +++++++++- bin/config-include/GridHypergrid.ini | 4 ---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 2ccc580..d072ed4 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -75,7 +75,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S [OpenIdService] ; for the server connector AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" ; * This is the new style user service. ; * "Realm" is the table that is used for user lookup. @@ -96,6 +96,13 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" +[AvatarService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + [LibraryService] LibraryName = "OpenSim Library" DefaultLibrary = "./inventory/Libraries.xml" @@ -107,6 +114,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" + AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 5dadace..a64fa37 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -44,7 +44,3 @@ ; which in turn uses this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" - -; Temporary... -[Communications] - InterregionComms = "LocalComms" \ No newline at end of file -- cgit v1.1 From fa272e752189655b039a027d12fcc21b9d177bcb Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 09:44:20 -0800 Subject: Updated configs. --- bin/config-include/Grid.ini | 8 +++++--- bin/config-include/GridCommon.ini.example | 6 ++++++ bin/config-include/GridHypergrid.ini | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index ebddfd5..6bf493b 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -12,6 +12,7 @@ InventoryServices = "RemoteInventoryServicesConnector" GridServices = "RemoteGridServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" + AuthenticationServices = "RemoteAuthenticationServicesConnector" AuthorizationServices = "RemoteAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" @@ -27,6 +28,7 @@ ; for the LocalGridServicesConnector which is used by the Remote one StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" -; Temporary... -[Communications] - InterregionComms = "LocalComms" \ 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 6a65523..4d94ccd 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -21,6 +21,12 @@ ; 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 diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index a64fa37..1a68362 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -44,3 +44,8 @@ ; which in turn uses this 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" -- cgit v1.1 From d939668d6a54bb25cbc56ec840058c08992fe536 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 10:15:14 -0800 Subject: Bug fix in create user: create inventory was missing. --- bin/OpenSim.Server.ini.example | 6 ++++++ bin/config-include/StandaloneHypergrid.ini | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index d072ed4..81b5302 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -88,6 +88,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" ; Realm = "useraccounts" + ;; 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" + [PresenceService] ; for the server connector diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 277d05a..a3e0547 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -72,10 +72,11 @@ [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - ;; These are for creating new accounts + ;; 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" -- cgit v1.1 From 14ab9b04c4883f75ccae0225c91429e39af14991 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 15:28:46 -0800 Subject: LL Login now uses default regions if the desired start location is not found. --- bin/OpenSim.Server.ini.example | 5 +++++ bin/config-include/StandaloneCommon.ini.example | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 81b5302..05deda2 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -55,6 +55,11 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" Realm = "regions" + ;; Next, we can specify properties of regions, including default and fallback regions + ;; The syntax is: Region_ = "" + ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut + ;; For example: + Region_WelcomeArea = "DefaultRegion, FallbackRegion" ; * This is the configuration for the freeswitch server in grid mode [FreeswitchService] diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 1679f93..ea03bed 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_ = "" + ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut + ;; For example: + Region_WelcomeArea = "DefaultRegion, FallbackRegion" [LibraryModule] ; Set this if you want to change the name of the OpenSim Library -- cgit v1.1 From 283ff593b127bea95f276b430a3e6bf43b9a1625 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 18:30:33 -0800 Subject: Make use of Fallback regions when the desired start region is having problems. --- bin/OpenSim.Server.ini.example | 4 ++-- bin/config-include/StandaloneCommon.ini.example | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 05deda2..b13e739 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -58,8 +58,8 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S ;; Next, we can specify properties of regions, including default and fallback regions ;; The syntax is: Region_ = "" ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut - ;; For example: - Region_WelcomeArea = "DefaultRegion, FallbackRegion" + ;; For example: + Region_Welcome_Area = "DefaultRegion, FallbackRegion" ; * This is the configuration for the freeswitch server in grid mode [FreeswitchService] diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index ea03bed..0d54b4d 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -43,7 +43,7 @@ ;; The syntax is: Region_ = "" ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut ;; For example: - Region_WelcomeArea = "DefaultRegion, FallbackRegion" + Region_Welcome_Area = "DefaultRegion, FallbackRegion" [LibraryModule] ; Set this if you want to change the name of the OpenSim Library -- cgit v1.1 From daa9866a9adf591c6b32f992d189f6a1189a1677 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 19:25:33 -0800 Subject: Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution. --- bin/config-include/Grid.ini | 1 - bin/config-include/GridHypergrid.ini | 1 - bin/config-include/StandaloneHypergrid.ini | 1 - 3 files changed, 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 6bf493b..27e5cfb 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -13,7 +13,6 @@ GridServices = "RemoteGridServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" - AuthorizationServices = "RemoteAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 1a68362..3089598 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -16,7 +16,6 @@ GridServices = "HGGridServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" - AuthorizationServices = "LocalAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index a3e0547..682170c 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -15,7 +15,6 @@ InventoryServices = "HGInventoryBroker" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "LocalAuthenticationServicesConnector" - AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "HGGridServicesConnector" PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" -- cgit v1.1 From f5fb14ff52f2088d5a489cef69edb5a675e067f7 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 13 Jan 2010 19:57:41 -0800 Subject: * Added the missing AvatarServices module. --- bin/config-include/Grid.ini | 1 + bin/config-include/GridHypergrid.ini | 1 + 2 files changed, 2 insertions(+) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 27e5cfb..4892306 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -11,6 +11,7 @@ AssetServices = "RemoteAssetServicesConnector" InventoryServices = "RemoteInventoryServicesConnector" GridServices = "RemoteGridServicesConnector" + AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 3089598..9077e73 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -14,6 +14,7 @@ AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" GridServices = "HGGridServicesConnector" + AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" -- cgit v1.1 From f1c30784ac767bf5f62e81748984b76d85d71f6a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 15 Jan 2010 15:11:58 -0800 Subject: * General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic. * HGSceneCommunicationService has been deleted * SceneCommunicationService will likely be deleted soon too --- bin/config-include/Grid.ini | 1 + bin/config-include/GridHypergrid.ini | 1 + bin/config-include/Standalone.ini | 1 + bin/config-include/StandaloneHypergrid.ini | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 4892306..1a9ac72 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -17,6 +17,7 @@ PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" + AgentTransferModule = "AgentTransferModule" LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 9077e73..1275a60 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -20,6 +20,7 @@ PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" + AgentTransferModule = "AgentTransferModule" LandServiceInConnector = true NeighbourServiceInConnector = true HypergridServiceInConnector = true diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index bf3237b..c9d483b 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -16,6 +16,7 @@ PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "LocalSimulationConnectorModule" + AgentTransferModule = "AgentTransferModule" LibraryModule = true LLLoginServiceInConnector = true diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 682170c..20c5d10 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -19,7 +19,8 @@ PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" - AvatarServices = "LocalAvatarServicesConnector"; + AvatarServices = "LocalAvatarServicesConnector" + AgentTransferModule = "AgentTransferModule" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true -- cgit v1.1 From bd6d1a24448dafea5be7ddbcd591b352040e4412 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 16 Jan 2010 07:46:07 -0800 Subject: Moved prim crossing to EntityTransferModule. Not complete yet. --- bin/config-include/Grid.ini | 2 +- bin/config-include/GridHypergrid.ini | 2 +- bin/config-include/Standalone.ini | 2 +- bin/config-include/StandaloneHypergrid.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 1a9ac72..5aae1bc 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -17,7 +17,7 @@ PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" - AgentTransferModule = "AgentTransferModule" + EntityTransferModule = "BasicEntityTransferModule" LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 1275a60..4b6bc17 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -20,7 +20,7 @@ PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" - AgentTransferModule = "AgentTransferModule" + EntityTransferModule = "BasicEntityTransferModule" LandServiceInConnector = true NeighbourServiceInConnector = true HypergridServiceInConnector = true diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index c9d483b..452b9e9 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -16,7 +16,7 @@ PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "LocalSimulationConnectorModule" - AgentTransferModule = "AgentTransferModule" + EntityTransferModule = "BasicEntityTransferModule" LibraryModule = true LLLoginServiceInConnector = true diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 20c5d10..7f44bb7 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -20,7 +20,7 @@ UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" AvatarServices = "LocalAvatarServicesConnector" - AgentTransferModule = "AgentTransferModule" + EntityTransferModule = "BasicEntityTransferModule" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true -- cgit v1.1 From 04e29c1bacbc1e2df980ae15896a847ce7535da2 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 16 Jan 2010 21:42:44 -0800 Subject: Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. --- bin/config-include/StandaloneHypergrid.ini | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 7f44bb7..cd09091 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -63,9 +63,22 @@ [GridService] ; for the HGGridServicesConnector to instantiate GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" + HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService" ; LocalGridServicesConnector needs this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" + +[HypergridService] + GridService = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" + AssetService = "OpenSim.Services.AssetService.dll:AssetService" + +[GatekeeperService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" + ;; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" -- cgit v1.1 From a7309d90dacf503b0170ad911289c33e9ab42821 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 08:40:05 -0800 Subject: * Added ServiceURLs to AgentCircuitData. * Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini. --- bin/config-include/StandaloneHypergrid.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index cd09091..79a8775 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -69,7 +69,7 @@ Realm = "regions" [HypergridService] - GridService = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" + GridService = "OpenSim.Services.GridService.dll:GridService" AssetService = "OpenSim.Services.AssetService.dll:AssetService" [GatekeeperService] -- cgit v1.1 From f276ba57bf5bd732fbc6a255213c9bb7f5f5f148 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 11:33:47 -0800 Subject: HG agent transfers are starting to work. Gatekeeper handlers are missing. --- bin/config-include/StandaloneHypergrid.ini | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 79a8775..3d05d51 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -20,7 +20,7 @@ UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" AvatarServices = "LocalAvatarServicesConnector" - EntityTransferModule = "BasicEntityTransferModule" + EntityTransferModule = "HGEntityTransferModule" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true @@ -28,6 +28,8 @@ NeighbourServiceInConnector = true LibraryModule = true LLLoginServiceInConnector = true + ;; err, temporary + SimulationServiceInConnector = true [AssetService] ; For the AssetServiceInConnector @@ -103,3 +105,8 @@ DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" + HomeURI = "http://127.0.0.1:9000" + GatewayURI = "http://127.0.0.1:9000" + InventoryServerURI = "http://127.0.0.1:9000" + AssetServerURI = "http://127.0.0.1:9000" + -- cgit v1.1 From b2e6ec9e12ad07eb08496ebe8ca0476b793017d5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 18:04:55 -0800 Subject: Agent gets there through the Gatekeeper, but still a few quirks to fix. --- bin/config-include/StandaloneHypergrid.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 3d05d51..67714cf 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -28,8 +28,7 @@ NeighbourServiceInConnector = true LibraryModule = true LLLoginServiceInConnector = true - ;; err, temporary - SimulationServiceInConnector = true + AuthenticationServiceInConnector = true [AssetService] ; For the AssetServiceInConnector -- cgit v1.1 From b5fcb5e872ec138ff7138906bffae193b6dae1a6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 17 Jan 2010 20:10:42 -0800 Subject: HG teleports through gatekeeper are working. --- bin/config-include/StandaloneHypergrid.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 67714cf..eb887a6 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -29,6 +29,7 @@ LibraryModule = true LLLoginServiceInConnector = true AuthenticationServiceInConnector = true + SimulationServiceInConnector = true [AssetService] ; For the AssetServiceInConnector -- cgit v1.1 From 3d536944153d4931cf891d6a788a47484f3e6f4d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 18 Jan 2010 16:34:23 -0800 Subject: Go Home works. With security!! --- bin/config-include/StandaloneHypergrid.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index eb887a6..28b9d47 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -82,6 +82,9 @@ GridService = "OpenSim.Services.GridService.dll:GridService" AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" +[HGEntityTransferModule] + HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService" + [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" -- cgit v1.1 From 9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 18 Jan 2010 20:35:59 -0800 Subject: * Towards enabling hyperlinks at grid-level. * Updated grid configs --- bin/OpenSim.Server.ini.example | 5 +++-- bin/config-include/GridHypergrid.ini | 13 ++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 3d2a5ba..0c6046f 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -42,7 +42,6 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S ; * [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=opensim;User ID=opensim;Password=opensim123;" @@ -58,10 +57,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S Realm = "regions" ; AllowDuplicateNames = "True" ;; Next, we can specify properties of regions, including default and fallback regions - ;; The syntax is: Region_ = "" + ;; The syntax is: Region_ = "" + ;; or: Region_ = "" ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate ;; For example: ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" + ; (replace spaces with underscore) ; * This is the configuration for the freeswitch server in grid mode [FreeswitchService] diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4b6bc17..4885a41 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -17,18 +17,17 @@ AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" + AuthorizationServices = "LocalAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" - EntityTransferModule = "BasicEntityTransferModule" + EntityTransferModule = "HGEntityTransferModule" LandServiceInConnector = true NeighbourServiceInConnector = true - HypergridServiceInConnector = true SimulationServiceInConnector = true LibraryModule = true InventoryServiceInConnector = false AssetServiceInConnector = false - LLLoginServiceInConnector = false [AssetService] LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" @@ -41,12 +40,12 @@ [GridService] ; for the HGGridServicesConnector to instantiate GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" + HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService" ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, ; which in turn uses this 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" +[HypergridService] + GridService = "OpenSim.Services.GridService.dll:GridService" + AssetService = "OpenSim.Services.AssetService.dll:AssetService" -- cgit v1.1 From 48b03c2c61a422c3ac9843892a2ae93b29a9f7b8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 24 Jan 2010 14:30:48 -0800 Subject: Integrated the hyperlinking with the GridService. --- bin/config-include/StandaloneHypergrid.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 28b9d47..af502db 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -65,7 +65,7 @@ [GridService] ; for the HGGridServicesConnector to instantiate GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" - HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService" + AssetService = "OpenSim.Services.AssetService.dll:AssetService" ; LocalGridServicesConnector needs this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" -- cgit v1.1 From 8ddf787cfd090fc8f2715a6f2a5329348a12e28b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 24 Jan 2010 16:00:28 -0800 Subject: Hypergrid map search back on, this time with a config var in the grid service. --- bin/config-include/StandaloneHypergrid.ini | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index af502db..0be7bab 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -70,6 +70,8 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" + AllowHypergridMapSearch = true + [HypergridService] GridService = "OpenSim.Services.GridService.dll:GridService" AssetService = "OpenSim.Services.AssetService.dll:AssetService" -- cgit v1.1 From b1b9ac2e740c04bf187cbee9ba7343ae3fec110e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 25 Jan 2010 09:08:57 -0800 Subject: Added image for hyperlink map tiles. --- bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 ++++++ bin/assets/TexturesAssetSet/hg2.jp2 | Bin 0 -> 24574 bytes 2 files changed, 6 insertions(+) create mode 100644 bin/assets/TexturesAssetSet/hg2.jp2 (limited to 'bin') diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 773de44..1d7f2a4 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml @@ -343,6 +343,12 @@ +
+ + + + +
diff --git a/bin/assets/TexturesAssetSet/hg2.jp2 b/bin/assets/TexturesAssetSet/hg2.jp2 new file mode 100644 index 0000000..9a66fd3 Binary files /dev/null and b/bin/assets/TexturesAssetSet/hg2.jp2 differ -- cgit v1.1 From 7c00469cd210cfdda3dd835867469159d4c8b9d9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 27 Jan 2010 08:00:29 -0800 Subject: Added ExternalName config on Gatekeeper. --- bin/config-include/StandaloneHypergrid.ini | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 0be7bab..98e37e3 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -83,6 +83,8 @@ 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. + ExternalName = "http://127.0.0.1:9000" [HGEntityTransferModule] HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService" -- cgit v1.1 From 00f7d622cbc2c2e61d2efaacd8275da3f9821d8b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Jan 2010 19:19:42 -0800 Subject: HG 1.5 is in place. Tested in standalone only. --- bin/config-include/StandaloneHypergrid.ini | 38 ++++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 98e37e3..9897149 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -72,23 +72,6 @@ AllowHypergridMapSearch = true -[HypergridService] - GridService = "OpenSim.Services.GridService.dll:GridService" - AssetService = "OpenSim.Services.AssetService.dll:AssetService" - -[GatekeeperService] - LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" - ;; for the service - UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" - 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. - ExternalName = "http://127.0.0.1:9000" - -[HGEntityTransferModule] - HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService" - [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" @@ -100,9 +83,11 @@ 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" @@ -113,7 +98,24 @@ WelcomeMessage = "Welcome, Avatar!" HomeURI = "http://127.0.0.1:9000" - GatewayURI = "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] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" + ;; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + UserAgentService = "OpenSim.Services.Hypergrid.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. + ExternalName = "http://127.0.0.1:9000" + +[UserAgentService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" + ;; for the service + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + -- cgit v1.1 From c99f40fc536e582c37d087e0ff54dea2f979894a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Jan 2010 19:32:23 -0800 Subject: Config for grid login. Untested. --- bin/OpenSim.Server.ini.example | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 0c6046f..4febd5a 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -10,7 +10,10 @@ ; * ; * [Startup] -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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,,OpenSim.Server.Handlers.dll:UserAccountServiceConnector" + +;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService + +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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,OpenSim.Server.Handlers.dll:UserAccountServiceConnector,OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService" ; * This is common for all services, it's the network setup for the entire ; * server instance @@ -132,6 +135,32 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S GridService = "OpenSim.Services.GridService.dll:GridService" SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" + ; Do you let your users go outside this grid? If so, use this + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" + HomeURI = "http://127.0.0.1:8003" + GatekeeperURI = "http://127.0.0.1:8003" + InventoryServerURI = "http://127.0.0.1:8003" + AssetServerURI = "http://127.0.0.1:8003" + +;; These 2 are for enabling HG1.5 + +[GatekeeperService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" + ;; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + UserAgentService = "OpenSim.Services.Hypergrid.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. + ExternalName = "http://127.0.0.1:8002" + +[UserAgentService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" + ;; for the service + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + -- cgit v1.1 From c9e64d578de718aca77e250e8ddd8ecb5026d202 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Jan 2010 19:36:42 -0800 Subject: Fixed broken dll name. --- bin/OpenSim.Server.ini.example | 2 +- bin/config-include/StandaloneHypergrid.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 4febd5a..e72ea68 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -151,7 +151,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" ;; for the service UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" - UserAgentService = "OpenSim.Services.Hypergrid.dll:UserAgentService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 9897149..0f8483b 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -106,7 +106,7 @@ LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" ;; for the service UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" - UserAgentService = "OpenSim.Services.Hypergrid.dll:UserAgentService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" -- cgit v1.1 From 0c81966c0a8f69474fb542d7b4df1780ef756519 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 29 Jan 2010 09:12:22 -0800 Subject: Works for grid login. --- bin/OpenSim.Server.ini.example | 5 +++-- bin/config-include/GridHypergrid.ini | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index e72ea68..5d4927b 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -13,7 +13,7 @@ ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService -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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,OpenSim.Server.Handlers.dll:UserAccountServiceConnector,OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService" +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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,OpenSim.Server.Handlers.dll:UserAccountServiceConnector,OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,OpenSim.Server.Handlers.dll:UserAgentServerConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance @@ -155,8 +155,9 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" ; how does the outside world reach me? This acts as public key too. - ExternalName = "http://127.0.0.1:8002" + ExternalName = "http://127.0.0.1:8003" [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4885a41..6c7e32e 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -40,12 +40,8 @@ [GridService] ; for the HGGridServicesConnector to instantiate GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" - HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService" ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, ; which in turn uses this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" -[HypergridService] - GridService = "OpenSim.Services.GridService.dll:GridService" - AssetService = "OpenSim.Services.AssetService.dll:AssetService" -- cgit v1.1 From 5001f61c08fea2ebfcb2590be69073d04d129d70 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 29 Jan 2010 18:59:41 -0800 Subject: * HGGridConnector is no longer necessary. * Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken. --- bin/config-include/GridHypergrid.ini | 5 ++--- bin/config-include/StandaloneHypergrid.ini | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 6c7e32e..015ced0 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -13,7 +13,7 @@ [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" - GridServices = "HGGridServicesConnector" + GridServices = "RemoteGridServicesConnector" AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" @@ -38,10 +38,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" StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + AllowHypergridMapSearch = true diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 0f8483b..395537d 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -13,9 +13,9 @@ [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" - NeighbourServices = "RemoteNeighbourServicesConnector" + NeighbourServices = "LocalNeighbourServicesConnector" AuthenticationServices = "LocalAuthenticationServicesConnector" - GridServices = "HGGridServicesConnector" + GridServices = "LocalGridServicesConnector" PresenceServices = "LocalPresenceServicesConnector" UserAccountServices = "LocalUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" @@ -63,9 +63,6 @@ LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" [GridService] - ; for the HGGridServicesConnector to instantiate - GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" - AssetService = "OpenSim.Services.AssetService.dll:AssetService" ; LocalGridServicesConnector needs this LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" -- cgit v1.1 From 42f978a478093da579907e15dc29680a3711b27e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 30 Jan 2010 09:23:07 -0800 Subject: * HGScene is no more. * Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module --- bin/config-include/StandaloneHypergrid.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 395537d..686d2a4 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -21,6 +21,7 @@ SimulationServices = "RemoteSimulationConnectorModule" AvatarServices = "LocalAvatarServicesConnector" EntityTransferModule = "HGEntityTransferModule" + InventoryAccessModule = "HGInventoryAccessModule" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true -- cgit v1.1 From a2096f58cedc3a225e01b300dedc64e2ea59b778 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 30 Jan 2010 17:41:01 -0800 Subject: Updated gridhypergrid config. --- bin/config-include/GridHypergrid.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 015ced0..4d40766 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -22,6 +22,7 @@ UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" EntityTransferModule = "HGEntityTransferModule" + InventoryAccessModule = "HGInventoryAccessModule" LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true -- cgit v1.1 From 40d8e91008b7d76ce6b9398484c591eb51c85bdb Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 11:10:57 -0800 Subject: * Added a few files that were missing in the repo. * New HGInventoryService which allows restricted access to inventory while outside --- bin/config-include/StandaloneHypergrid.ini | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 686d2a4..f36b0c4 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -33,7 +33,6 @@ SimulationServiceInConnector = true [AssetService] - ; For the AssetServiceInConnector LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" ; For HGAssetBroker @@ -41,7 +40,6 @@ HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" [InventoryService] - ; For the InventoryServiceInConnector LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" ; For HGInventoryBroker @@ -49,7 +47,6 @@ HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" [AvatarService] - ; For the InventoryServiceInConnector LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" [LibraryService] @@ -117,3 +114,8 @@ 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" -- cgit v1.1 From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:01:23 -0800 Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. --- bin/OpenSim.Server.ini.example | 39 ++++++------------------------ bin/OpenSim.ini.example | 39 +++--------------------------- bin/config-include/Grid.ini | 1 + bin/config-include/GridHypergrid.ini | 5 ---- bin/config-include/StandaloneHypergrid.ini | 3 --- 5 files changed, 11 insertions(+), 76 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 5d4927b..5def529 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -11,15 +11,13 @@ ; * [Startup] -;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService - -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:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,OpenSim.Server.Handlers.dll:UserAccountServiceConnector,OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,OpenSim.Server.Handlers.dll:UserAgentServerConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector" ; * This is common for all services, it's the network setup for the entire -; * server instance +; * server instance, if none if specified above ; * -[Network] - port = 8003 +;[Network] +; port = 8003 ; * The following are for the remote console ; * They have no effect for the local or basic console types @@ -135,33 +133,10 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S GridService = "OpenSim.Services.GridService.dll:GridService" SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" - ; Do you let your users go outside this grid? If so, use this - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" - HomeURI = "http://127.0.0.1:8003" - GatekeeperURI = "http://127.0.0.1:8003" - InventoryServerURI = "http://127.0.0.1:8003" - AssetServerURI = "http://127.0.0.1:8003" - -;; These 2 are for enabling HG1.5 - -[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" - SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" - ; how does the outside world reach me? This acts as public key too. - ExternalName = "http://127.0.0.1:8003" -[UserAgentService] - LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" - ;; for the service - PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" - GridService = "OpenSim.Services.GridService.dll:GridService" - +;; Uncomment if you want your grid to become Hypergrid-enabled +;;[Hypergrid] +;; Include-Hypergrid = "OpenSim.Server.HG.ini" diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 3b560de..70f03a1 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -19,13 +19,6 @@ ; inside your firewall, separate patterns with a ';' ; HttpProxyExceptions = ".mydomain.com;localhost" - ; Set this to true if you are connecting your regions to a grid - ; Set this to false if you are running in standalone mode - gridmode = false - - ; Set this to true if you want Hypergrid functionality - hypergrid = false - startup_console_commands_file = "startup_commands.txt" shutdown_console_commands_file = "shutdown_commands.txt" @@ -118,7 +111,7 @@ ;InworldRestartShutsDown = false ; ## - ; ## STORAGE + ; ## PRIM STORAGE ; ## ; *** Prim Storage - only leave one storage_plugin uncommented *** @@ -134,7 +127,7 @@ ; --- To use MySQL storage, supply your own connection string (this is only an example): ; note that the supplied account needs create privilegies if you want it to auto-create needed tables. ; - ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully! + ; -->>> There are multiple connection strings defined in several places. Check it carefully! ; ; storage_plugin="OpenSim.Data.MySQL.dll" ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; @@ -142,15 +135,6 @@ ; uncomment and change this connect string. Defaults to the above if not set ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; - ; Select whether you want to use local or grid asset storage. - ; - ; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should - ; really be eliminated). The database itself is defined in asset_plugin below - ; - ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the - ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets - ; locally. This will mean you won't be able to take items using your assets to other people's regions. - ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to ; prevent frequently changing objects from heavily loading the region data store. ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep. @@ -338,8 +322,6 @@ ConsolePass = "secret" http_listener_port = 9000 console_port = 0 - default_location_x = 1000 - default_location_y = 1000 ; ssl config: Experimental! The auto https config only really works definately on windows XP now ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below @@ -356,21 +338,6 @@ ; Uncomment below to enable llRemoteData/remote channels ; remoteDataPort = 20800 - grid_server_url = "http://127.0.0.1:8003" - grid_send_key = "null" - grid_recv_key = "null" - - user_server_url = "http://127.0.0.1:8002" - user_send_key = "null" - user_recv_key = "null" - - asset_server_url = "http://127.0.0.1:8003" - - inventory_server_url = "http://127.0.0.1:8003" - - ; The MessagingServer is a companion of the UserServer. It uses - ; user_send_key and user_recv_key, too - messaging_server_url = "http://127.0.0.1:8006" ; What is reported as the "X-Secondlife-Shard" ; Defaults to the user server url if not set @@ -1360,7 +1327,7 @@ [GridService] ;; default standalone, overridable in StandaloneCommon.ini - StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The following is the configuration section for the new style services diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5aae1bc..56c76c6 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -18,6 +18,7 @@ UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" EntityTransferModule = "BasicEntityTransferModule" + InventoryAccessModule = "BasicInventoryAccessModule" LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4d40766..7391278 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -7,9 +7,6 @@ [Includes] Include-Common = "config-include/GridCommon.ini" -[Startup] - hypergrid = true - [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" @@ -27,8 +24,6 @@ NeighbourServiceInConnector = true SimulationServiceInConnector = true LibraryModule = true - InventoryServiceInConnector = false - AssetServiceInConnector = false [AssetService] LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index f36b0c4..63ea832 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -6,9 +6,6 @@ [Includes] Include-Common = "config-include/StandaloneCommon.ini" - -[Startup] - hypergrid = true [Modules] AssetServices = "HGAssetBroker" -- cgit v1.1 From 67b0fcf806b0f246fd4386410d445b9ac3e29aea Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:07:13 -0800 Subject: * Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini * Cleaned up standalone configs --- bin/OpenSim.Server.HG.ini | 44 +++++++++++++++++++++++++ bin/config-include/StandaloneCommon.ini.example | 14 +++++++- bin/config-include/StandaloneHypergrid.ini | 9 ----- 3 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 bin/OpenSim.Server.HG.ini (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini b/bin/OpenSim.Server.HG.ini new file mode 100644 index 0000000..2ec4957 --- /dev/null +++ b/bin/OpenSim.Server.HG.ini @@ -0,0 +1,44 @@ +;; Extra configurations for enabling HG1.5 + +;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService +;; OpenSim.Server.Handlers.dll:UserAgentService +;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector + +ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" + +[LoginService] + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) + ; CHANGE THIS + HomeURI = "http://127.0.0.1:8002" + GatekeeperURI = "http://127.0.0.1:8002" + InventoryServerURI = "http://127.0.0.1:8002" + AssetServerURI = "http://127.0.0.1:8002" + +[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" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + ; how does the outside world reach me? This acts as public key too. + ; CHANGE THIS + ExternalName = "http://127.0.0.1:8002" + +[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 restricts the inventory operations while in other grids. +;; Still not completely safe, especially if users perform inventory operations +;; while in those grids. The more the user accesses his/her inventory, the more +;; those simulators will know about the user's inventory. +[HGInventoryService] + ; For the InventoryServiceInConnector + LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 0d54b4d..b4db6dc 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -47,4 +47,16 @@ [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] + DefaultRegion = "OpenSim Test" + 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 63ea832..06f1898 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -86,14 +86,6 @@ GridService = "OpenSim.Services.GridService.dll:GridService" AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" - DefaultRegion = "OpenSim Test" - 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] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" ;; for the service @@ -103,7 +95,6 @@ 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. - ExternalName = "http://127.0.0.1:9000" [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" -- cgit v1.1 From 823b9607e26fc30cb5a24f5b93c6b5499f8ffaf6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:19:03 -0800 Subject: Can't comment [Network] even if it's not used. --- bin/OpenSim.Server.ini.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 5def529..ee9e661 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -16,8 +16,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * This is common for all services, it's the network setup for the entire ; * server instance, if none if specified above ; * -;[Network] -; port = 8003 +[Network] + port = 8003 ; * The following are for the remote console ; * They have no effect for the local or basic console types -- cgit v1.1 From af758ea16456a47832cc823465819fc4f9576c77 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 14:01:47 -0800 Subject: * More config cleanup * Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example * Added a separate OpenSim.Server.HG.ini.example to make it easier to run --- bin/OpenSim.Server.HG.ini | 44 ---------- bin/OpenSim.Server.HG.ini.example | 173 ++++++++++++++++++++++++++++++++++++++ bin/OpenSim.Server.ini.example | 3 - bin/OpenSim.ini.example | 50 ----------- 4 files changed, 173 insertions(+), 97 deletions(-) delete mode 100644 bin/OpenSim.Server.HG.ini create mode 100644 bin/OpenSim.Server.HG.ini.example (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini b/bin/OpenSim.Server.HG.ini deleted file mode 100644 index 2ec4957..0000000 --- a/bin/OpenSim.Server.HG.ini +++ /dev/null @@ -1,44 +0,0 @@ -;; Extra configurations for enabling HG1.5 - -;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService -;; OpenSim.Server.Handlers.dll:UserAgentService -;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector - -ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" - -[LoginService] - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" - ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) - ; CHANGE THIS - HomeURI = "http://127.0.0.1:8002" - GatekeeperURI = "http://127.0.0.1:8002" - InventoryServerURI = "http://127.0.0.1:8002" - AssetServerURI = "http://127.0.0.1:8002" - -[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" - SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" - ; how does the outside world reach me? This acts as public key too. - ; CHANGE THIS - ExternalName = "http://127.0.0.1:8002" - -[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 restricts the inventory operations while in other grids. -;; Still not completely safe, especially if users perform inventory operations -;; while in those grids. The more the user accesses his/her inventory, the more -;; those simulators will know about the user's inventory. -[HGInventoryService] - ; For the InventoryServiceInConnector - LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example new file mode 100644 index 0000000..7c1ccef --- /dev/null +++ b/bin/OpenSim.Server.HG.ini.example @@ -0,0 +1,173 @@ +;; Configurations for enabling HG1.5 +;; +;; Run +;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini + +;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService +;; OpenSim.Server.Handlers.dll:UserAgentService +;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector +;; +;; Note that we're putting the asset service in 8002. +;; Make sure your simulators point to that. + +[Startup] +ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" + +; * This is common for all services, it's the network setup for the entire +; * server instance, if none if specified above +; * +[Network] + port = 8003 + +; * The following are for the remote console +; * They have no effect for the local or basic console types +; * Leave commented to diable logins to the console +;ConsoleUser = Test +;ConsolePass = secret +;ConsolePort = 0 + +; * As an example, the below configuration precisely mimicks the legacy +; * asset server. It is read by the asset IN connector (defined above) +; * and it then loads the OUT connector (a local database module). That, +; * 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=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" + 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" + ; AllowDuplicateNames = "True" + ;; Next, we can specify properties of regions, including default and fallback regions + ;; The syntax is: Region_ = "" + ;; or: Region_ = "" + ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate + ;; For example: + ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" + ; (replace spaces with underscore) + +; * This is the configuration for the freeswitch server in grid mode +[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. +; * By setting it to "users", you can use the old style users table +; * as an authentication source. +; * +[AuthenticationService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +[OpenIdService] + ; for the server connector + AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + +; * 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] + ; for the server connector + LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + ; Realm = "useraccounts" + ;; 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" + +[PresenceService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +[AvatarService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" + ; for the service + 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] + ; for the server connector + LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" + ; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" + AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + + DefaultRegion = "OpenSim Test" + WelcomeMessage = "Welcome, Avatar!" + ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) + ; CHANGE THIS + HomeURI = "http://127.0.0.1:8002" + GatekeeperURI = "http://127.0.0.1:8002" + InventoryServerURI = "http://127.0.0.1:8002" + AssetServerURI = "http://127.0.0.1:8002" + +[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" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + ; how does the outside world reach me? This acts as public key too. + ; CHANGE THIS + ExternalName = "http://127.0.0.1:8002" + +[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 restricts the inventory operations while in other grids. +;; Still not completely safe, especially if users perform inventory operations +;; while in those grids. The more the user accesses his/her inventory, the more +;; those simulators will know about the user's inventory. +[HGInventoryService] + ; For the InventoryServiceInConnector + LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index ee9e661..6912d88 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -137,6 +137,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" -;; Uncomment if you want your grid to become Hypergrid-enabled -;;[Hypergrid] -;; Include-Hypergrid = "OpenSim.Server.HG.ini" diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 70f03a1..6cb3f02 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -267,56 +267,6 @@ ;SMTP_SERVER_LOGIN=foo ;SMTP_SERVER_PASSWORD=bar - -[Communications] - ;InterregionComms = "LocalComms" - InterregionComms = "RESTComms" - - -[StandAlone] - ; If this is set to true then OpenSim only allows in users who already have accounts. - ; An account can be created using the "create user" console command. - ; - ; If this is set to false then an account is automatically created for a user who logs in - ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED. - ; Therefore, any user can log into any account. If accounts_authenticate is later switched to - ; true then the passwords will need to be reset (using the "reset user password" console command) since - ; automatically created accounts have their password set to the string "test". - ; - ; This setting applies to standalone mode only, not grid or other modes. Default is true. - accounts_authenticate = true - - welcome_message = "Welcome to OpenSimulator" - - ; Inventory database provider - inventory_plugin = "OpenSim.Data.SQLite.dll" - ; inventory_plugin = "OpenSim.Data.MySQL.dll" - - ; Inventory source SQLite example - inventory_source = "URI=file:inventoryStore.db,version=3" - ; Inventory Source MySQL example - ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" - - ; User Data Database provider - ; - ; Multiple providers can be specified by separating them with commas (whitespace is unimportant) - ; If multiple providers are specified then if a profile is requested, each is queried until one - ; provides a valid profile, or until all providers have been queried. - ; Unfortunately the order of querying is currently undefined (it may not be the order in which - ; providers are specified here). This needs to be fixed - ; - userDatabase_plugin = "OpenSim.Data.SQLite.dll" - ; userDatabase_plugin = "OpenSim.Data.MySQL.dll" - - ; User source SQLite example - user_source = "URI=file:userprofiles.db,version=3" - ; User Source MySQL example - ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" - - ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute - ; Default is ./inventory/Libraries.xml - LibrariesXMLFile="./inventory/Libraries.xml" - [Network] ConsoleUser = "Test" ConsolePass = "secret" -- cgit v1.1 From a6b50c243605761cf9f248f9cf222b4ecfb5a6ba Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 14:07:26 -0800 Subject: In HG, add asset service handlers to 8002, to make it even easier. --- bin/OpenSim.Server.HG.ini.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index 7c1ccef..1f63470 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example @@ -6,12 +6,12 @@ ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService ;; OpenSim.Server.Handlers.dll:UserAgentService ;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector +;; An additional OpenSim.Server.Handlers.dll:AssetServiceConnector is started +;; in port 8002, outside the firewall ;; -;; Note that we're putting the asset service in 8002. -;; Make sure your simulators point to that. [Startup] -ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none if specified above -- cgit v1.1 From 0b89afd3e5a8fe95677fb916cfde649361a349fe Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 14:37:22 -0800 Subject: * Simplified the configuration by having [DatabaseService] in it * Fixed configuration issue for HGInventoryServerInConnector * Corrected typos in debug messages --- bin/OpenSim.Server.HG.ini.example | 25 +++++-------------------- bin/OpenSim.Server.ini.example | 24 +++++------------------- 2 files changed, 10 insertions(+), 39 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index 1f63470..0ba8601 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example @@ -11,7 +11,7 @@ ;; [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none if specified above @@ -26,6 +26,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ;ConsolePass = secret ;ConsolePort = 0 +[DatabaseService] + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + ; * As an example, the below configuration precisely mimicks the legacy ; * asset server. It is read by the asset IN connector (defined above) ; * and it then loads the OUT connector (a local database module). That, @@ -35,8 +39,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 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 @@ -44,8 +46,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [InventoryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 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. @@ -53,8 +53,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * [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" ; AllowDuplicateNames = "True" ;; Next, we can specify properties of regions, including default and fallback regions @@ -77,9 +75,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [AuthenticationService] ; for the server connector LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [OpenIdService] ; for the server connector @@ -93,10 +88,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [UserAccountService] ; for the server connector LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" - ; Realm = "useraccounts" ;; These are for creating new accounts by the service AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" @@ -106,16 +97,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [PresenceService] ; for the server connector LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [AvatarService] ; for the server connector LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [LibraryService] LibraryName = "OpenSim Library" diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 6912d88..543d20d 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -26,6 +26,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ;ConsolePass = secret ;ConsolePort = 0 +[DatabaseService] + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + + ; * As an example, the below configuration precisely mimicks the legacy ; * asset server. It is read by the asset IN connector (defined above) ; * and it then loads the OUT connector (a local database module). That, @@ -35,8 +40,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 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 @@ -44,8 +47,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [InventoryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 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. @@ -53,8 +54,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * [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" ; AllowDuplicateNames = "True" ;; Next, we can specify properties of regions, including default and fallback regions @@ -77,9 +76,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [AuthenticationService] ; for the server connector LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [OpenIdService] ; for the server connector @@ -93,9 +89,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [UserAccountService] ; for the server connector LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" ; Realm = "useraccounts" ;; These are for creating new accounts by the service AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" @@ -106,16 +99,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [PresenceService] ; for the server connector LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [AvatarService] ; for the server connector LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - ; for the service - StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" [LibraryService] LibraryName = "OpenSim Library" @@ -134,6 +121,5 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" - DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" -- cgit v1.1 From 35a245b67a44eaa62dbf7951646ad9818caa8b02 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 22:35:23 -0800 Subject: Assorted bug fixes related to hyperlinking --- bin/config-include/GridCommon.ini.example | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4d94ccd..a62868e 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -20,6 +20,7 @@ ; change this to your grid-wide grid server ; GridServerURI = "http://mygridserver.com:8003" + ;AllowHypergridMapSearch = true [AvatarService] ; -- cgit v1.1 From df3ab04e0ca202f9457339a048343b87578d7c2b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 2 Feb 2010 16:28:41 -0800 Subject: Removed useless config. --- bin/OpenSim.Server.HG.ini.example | 1 - bin/config-include/StandaloneCommon.ini.example | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index 0ba8601..fea0ea2 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example @@ -120,7 +120,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" - DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) ; CHANGE THIS diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index b4db6dc..8e21a8c 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -50,9 +50,8 @@ ;LibraryName = "My World's Library" [LoginService] - DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" - + HomeURI = "http://127.0.0.1:9000" GatekeeperURI = "http://127.0.0.1:9000" InventoryServerURI = "http://127.0.0.1:9000" -- cgit v1.1 From b18e95b3a228e0ca74e9c90ae191e09022ab35f1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 8 Feb 2010 07:49:14 -0800 Subject: Added missing configs to Standalone.ini --- bin/config-include/Standalone.ini | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 452b9e9..171611e 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -11,12 +11,14 @@ 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 @@ -31,15 +33,20 @@ LibraryName = "OpenSim Library" DefaultLibrary = "./inventory/Libraries.xml" +[AvatarService] + LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" + [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" [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" @@ -55,6 +62,6 @@ InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" - - DefaultRegion = "OpenSim Test" + AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" + WelcomeMessage = "Welcome, Avatar!" -- cgit v1.1 From 9f5b39300a729ffb27cdf908e0d12f9576f38b78 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 8 Feb 2010 20:26:47 +0000 Subject: Add InventoryService to default standalone config --- bin/config-include/Standalone.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 171611e..0c74ea4 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -54,6 +54,7 @@ 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" -- cgit v1.1 From dc197856727c06b0b06488ab839409831af84865 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 14 Feb 2010 16:57:02 -0800 Subject: Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite --- bin/config-include/Standalone.ini | 6 ++++++ bin/config-include/StandaloneHypergrid.ini | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 0c74ea4..bd90df4 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -35,10 +35,15 @@ [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" @@ -50,6 +55,7 @@ [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" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 06f1898..a4fa5be 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -45,6 +45,7 @@ [AvatarService] LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" + StorageProvider = "OpenSim.Data.Null.dll" [LibraryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" @@ -56,19 +57,23 @@ [AuthenticationService] LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - + StorageProvider = "OpenSim.Data.Null.dll" + [GridService] ; 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" -- cgit v1.1 From 0ab6aac05255078a9d190f6623b2d86d5253d955 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 20 Feb 2010 17:52:38 -0800 Subject: Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work. --- bin/config-include/Standalone.ini | 8 +++++--- bin/config-include/StandaloneHypergrid.ini | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index bd90df4..b9a9462 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -4,9 +4,6 @@ ;; which you can copy and change. ;; -[Includes] - Include-Common = "config-include/StandaloneCommon.ini" - [Modules] AssetServices = "LocalAssetServicesConnector" InventoryServices = "LocalInventoryServicesConnector" @@ -72,3 +69,8 @@ AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" WelcomeMessage = "Welcome, Avatar!" + + +;; This should always be the very last thing on this file +[Includes] + Include-Common = "config-include/StandaloneCommon.ini" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index a4fa5be..9ad6d1c 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -3,9 +3,6 @@ ;; All optional settings are in StandaloneCommon.ini.example, ;; which you can copy and change. ;; - -[Includes] - Include-Common = "config-include/StandaloneCommon.ini" [Modules] AssetServices = "HGAssetBroker" @@ -112,3 +109,8 @@ [HGInventoryService] ; For the InventoryServiceInConnector LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" + + +;; This should always be the very last thing on this file +[Includes] + Include-Common = "config-include/StandaloneCommon.ini" -- cgit v1.1 From 552e9e8c7832f41f5a53666d9c3ece62f57be4ba Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 21 Feb 2010 09:09:35 -0800 Subject: * Added SQlite connector for AvatarData. Tested -- works. * Small bug fix in debug message * Set default standalone configs to use SQLite across the board --- bin/config-include/Standalone.ini | 6 +++--- bin/config-include/StandaloneHypergrid.ini | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index b9a9462..06333d8 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -32,14 +32,14 @@ [AvatarService] LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:avatars.db,version=3" [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" [AuthenticationService] LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:auth.db,version=3" [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" @@ -52,7 +52,7 @@ [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:userprofiles.db,version=3" ;; These are for creating new accounts AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 9ad6d1c..04a2356 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -42,7 +42,7 @@ [AvatarService] LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:avatars.db,version=3" [LibraryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" @@ -54,7 +54,7 @@ [AuthenticationService] LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:auth.db,version=3" [GridService] ; LocalGridServicesConnector needs this @@ -70,7 +70,7 @@ [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - StorageProvider = "OpenSim.Data.Null.dll" + ConnectionString = "URI=file:userprofiles.db,version=3" ;; These are for creating new accounts by the service AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" -- cgit v1.1 From e6c869ddfc73af3cdb01b1232932db81cf6d0621 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 22 Feb 2010 13:18:11 +0900 Subject: Minor formatting cleanup. --- bin/OpenSim.ini.example | 66 +++++++++++++++++++-------------------- bin/config-include/Standalone.ini | 5 ++- 2 files changed, 35 insertions(+), 36 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index ebc9b24..5214718 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -31,26 +31,26 @@ ; To run a script every few minutes, set the script filename here ; timer_Script = "filename" - + ; ## ; ## SYSTEM ; ## - + ; Sets the method that OpenSim will use to fire asynchronous ; events. Valid values are UnsafeQueueUserWorkItem, ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread. - ; SmartThreadPool is reported to work well on Mono/Linux, but + ; SmartThreadPool is reported to work well on Mono/Linux, but ; UnsafeQueueUserWorkItem has been benchmarked with better ; performance on .NET/Windows async_call_method = SmartThreadPool - + ; There are several operations on large collections (such as ; the current avatar list) that can be run synchronously or ; in parallel. Running in parallel should increase performance ; on a multi-core system, but will make debugging more ; difficult if something deadlocks or times out use_async_when_possible = false - + ; Max threads to allocate on the FireAndForget thread pool ; when running with the SmartThreadPool option above MaxPoolThreads = 15 @@ -103,7 +103,7 @@ ; How many prims to send to each avatar in the scene on each Update() ; MaxPrimsPerFrame = 200 - + ; Combine all contiguous regions into one large region ; Order your regions from South to North, West to East in your regions.ini and then set this to true ; Warning! Don't use this with regions that have existing content!, This will likely break them @@ -351,7 +351,7 @@ http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer ; Hostname to use in llRequestURL/llRequestSecureURL - ; if not defined - default machine name is being used + ; if not defined - default machine name is being used ; (on Windows this mean NETBIOS name - useably only inside local network) ; ExternalHostNameForLSL=127.0.0.1 ; Uncomment below to enable llRemoteData/remote channels @@ -388,11 +388,11 @@ [ClientStack.LindenUDP] ; Set this to true to process incoming packets asynchronously. Networking is ; already separated from packet handling with a queue, so this will only - ; affect whether networking internals such as packet decoding and + ; affect whether networking internals such as packet decoding and ; acknowledgement accounting are done synchronously or asynchronously ; ;async_packet_handling = false - + ; The client socket receive buffer size determines how many ; incoming requests we can process; the default on .NET is 8192 ; which is about 2 4k-sized UDP datagrams. On mono this is @@ -409,7 +409,7 @@ ; net.core.rmem_max=X") ; ;client_socket_rcvbuf_size = 8388608 - + ; Maximum outbound bytes per second for a single scene. This can be used to ; throttle total outbound UDP traffic for a simulator. The default value is ; 0, meaning no throttling at the scene level. The example given here is @@ -417,13 +417,13 @@ ; ;scene_throttle_max_bps = 2621440 - ; Maximum bits per second to send to any single client. This will override + ; Maximum bits per second to send to any single client. This will override ; the user's viewer preference settings. The default value is 0, meaning no ; aggregate throttling on clients (only per-category throttling). The ; example given here is 1.5 megabits ; ;client_throttle_max_bps = 196608 - + ; Per-client bytes per second rates for the various throttle categories. ; These are default values that will be overriden by clients ; @@ -435,7 +435,7 @@ ;texture_default = 1000 ;asset_default = 1000 ;state_default = 1000 - + ; Per-client maximum burst rates in bytes per second for the various ; throttle categories. These are default values that will be overriden by ; clients @@ -448,10 +448,10 @@ ;texture_limit = 55750 ;asset_limit = 27500 ;state_limit = 37000 - + ; Configures how ObjectUpdates are aggregated. These numbers ; do not literally mean how many updates will be put in each - ; packet that goes over the wire, as packets are + ; packet that goes over the wire, as packets are ; automatically split on a 1400 byte boundary. These control ; the balance between responsiveness of interest list updates ; and total throughput. Higher numbers will ensure more full- @@ -609,7 +609,7 @@ ; used to control llMove2Target body_pid_derivative = 35 body_pid_gain = 25 - + ; maximum number of contact points to generate per collision contacts_per_collision = 80 @@ -798,7 +798,7 @@ ;;arrival and departure of certain users. For example: admins, bots. ;exclude_list=User 1,User 2,User 3 - + ;[CMS] ;enabled = true @@ -975,7 +975,7 @@ ; Stack size per thread created ThreadStackSize = 262144 - + ; Set this to true (the default) to load each script into a separate ; AppDomain. Setting this to false will load all script assemblies into the ; current AppDomain, which will reduce the per-script overhead at the @@ -1167,25 +1167,25 @@ ; Enables the Mini Region Modules Script Engine. ; default is false Enabled = false - - ; Runs MRM in a Security Sandbox - ; WARNING: DISABLING IS A SECURITY RISK. - Sandboxed = true - - ; The level sandbox to use, adjust at your OWN RISK. - ; Valid values are: - ; * FullTrust + + ; Runs MRM in a Security Sandbox + ; WARNING: DISABLING IS A SECURITY RISK. + Sandboxed = true + + ; The level sandbox to use, adjust at your OWN RISK. + ; Valid values are: + ; * FullTrust ; * SkipVerification ; * Execution ; * Nothing ; * LocalIntranet ; * Internet ; * Everything - SandboxLevel = "Internet" + SandboxLevel = "Internet" - ; Only allow Region Owners to run MRMs - ; May represent a security risk if you disable this. - OwnerOnly = true + ; Only allow Region Owners to run MRMs + ; May represent a security risk if you disable this. + OwnerOnly = true [Hypergrid] ; Keep it false for now. Making it true requires the use of a special client in order to access inventory @@ -1335,7 +1335,7 @@ [WebStats] ; View region statistics via a web page -; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page +; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page ; Use a web browser and type in the "Login URI" + "/SStats/" ; For example- http://127.0.0.1:9000/SStats/ ; enabled=false @@ -1354,14 +1354,14 @@ [AssetService] DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" AssetLoaderArgs = "assets/AssetSets.xml" - + ; Disable this to prevent the default asset set from being inserted into the ; asset store each time the region starts AssetLoaderEnabled = true [GridService] ;; default standalone, overridable in StandaloneCommon.ini - StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The following is the configuration section for the new style services diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index cdfdf4b..35ee01e 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -20,11 +20,10 @@ [InventoryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" - + [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" [GridService] - LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" Realm = "regions" - -- cgit v1.1 From 0d85f4f8612ce8c839b8cf75668978e1860ddad3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 22 Feb 2010 09:56:03 -0800 Subject: Deleted duplicate [GridService] section. --- bin/OpenSim.Server.ini.example | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 0535765..54101b0 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -122,17 +122,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" WelcomeMessage = "Welcome, Avatar!" - -; * 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" - -; If true, duplicate region names are allowed on the grid. If false, no duplicate names are allowed -; Default is false -; AllowDuplicateNames = "True" -- cgit v1.1 From c7b1e76eb5fbc73ccbde6f91718e5454a1e3a228 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 25 Feb 2010 01:46:34 +0000 Subject: Add the stream handler/listener and requisite methods to the friends module for the friends interregion comms. --- bin/OpenSim.ini.example | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index dd487b7..7eea3b4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -1316,3 +1316,8 @@ ;XmlRpcRouterModule = "XmlRpcRouterModule" ;XmlRpcPort = 20800 + +[Friends] + ; The port the friendslist interregion comms will listen on + ; Defaults to the simulator's TCP port + ;Port = 0 -- cgit v1.1 From 0b73ee3cd8ec8f427c753668ba0fa83a810cff85 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 25 Feb 2010 03:14:23 +0000 Subject: Add part of the needed config examples --- bin/OpenSim.ini.example | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 7eea3b4..00e54db 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -1321,3 +1321,8 @@ ; The port the friendslist interregion comms will listen on ; Defaults to the simulator's TCP port ;Port = 0 + + ; Uncomment one of the lines below. Use FriendsService for local + ; operation, Connectors for remote operation + ;Connector = "OpenSim.Services.FriendsService.dll" + Connector = "OpenSim.Services.Connectors.dll" -- cgit v1.1 From 679ad9575083370204a6d83e9933323c9f60ae45 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 25 Feb 2010 16:11:04 -0800 Subject: List of friends now retrieved upon login. Configured and tested in standalone only. --- bin/config-include/Standalone.ini | 4 ++++ bin/config-include/StandaloneHypergrid.ini | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 06333d8..ce77b3f 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -59,6 +59,9 @@ GridService = "OpenSim.Services.GridService.dll:GridService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" +[Friends] + Connector = "OpenSim.Services.FriendsService.dll" + [LoginService] LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" @@ -67,6 +70,7 @@ PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" + FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" WelcomeMessage = "Welcome, Avatar!" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 04a2356..ecdd6f7 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -77,6 +77,8 @@ GridService = "OpenSim.Services.GridService.dll:GridService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" +[Friends] + Connector = "OpenSim.Services.FriendsService.dll" [LoginService] LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" @@ -87,16 +89,18 @@ PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" GridService = "OpenSim.Services.GridService.dll:GridService" AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" + FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" - ;; for the service + ;; for the service UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + 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. + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + WelcomeMessage = "Welcome, Avatar!" [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" -- cgit v1.1 From c745df007d1730e59fbdb4ebf8440654d1675ade Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 25 Feb 2010 17:42:51 -0800 Subject: Added server-side Friends in connector. Untested. --- bin/OpenSim.Server.HG.ini.example | 1 + bin/OpenSim.Server.ini.example | 1 + bin/config-include/Grid.ini | 3 +++ bin/config-include/GridHypergrid.ini | 3 +++ 4 files changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index fea0ea2..732d123 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example @@ -119,6 +119,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" WelcomeMessage = "Welcome, Avatar!" ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 54101b0..e6508b1 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -120,5 +120,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 GridService = "OpenSim.Services.GridService.dll:GridService" SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" + FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" WelcomeMessage = "Welcome, Avatar!" diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 56c76c6..a656e7b 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -34,3 +34,6 @@ LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" LibraryName = "OpenSim Library" DefaultLibrary = "./inventory/Libraries.xml" + +[Friends] + Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 7391278..36cefdc 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -40,3 +40,6 @@ StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" AllowHypergridMapSearch = true + +[Friends] + Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" -- cgit v1.1 From cc05bdf6aba5d74202cb5863a5d0f5950540e7bd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 26 Feb 2010 08:46:30 -0800 Subject: * Friends out connector completed. Grid login retrieves friends correctly. * Added friends configs to grid .inis --- bin/OpenSim.Server.HG.ini.example | 6 +++++- bin/OpenSim.Server.ini.example | 6 +++++- bin/config-include/Grid.ini | 2 +- bin/config-include/GridCommon.ini.example | 7 +++++++ bin/config-include/GridHypergrid.ini | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example index 732d123..97c2e06 100644 --- a/bin/OpenSim.Server.HG.ini.example +++ b/bin/OpenSim.Server.HG.ini.example @@ -11,7 +11,7 @@ ;; [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none if specified above @@ -102,6 +102,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; for the server connector LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" +[FriendsService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService" + [LibraryService] LibraryName = "OpenSim Library" DefaultLibrary = "./inventory/Libraries.xml" diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index e6508b1..e822e83 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -11,7 +11,7 @@ ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none if specified above @@ -104,6 +104,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; for the server connector LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" +[FriendsService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService" + [LibraryService] LibraryName = "OpenSim Library" DefaultLibrary = "./inventory/Libraries.xml" diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index a656e7b..9dff325 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -36,4 +36,4 @@ DefaultLibrary = "./inventory/Libraries.xml" [Friends] - Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" + Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index a62868e..4717561 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -46,6 +46,13 @@ ; AuthenticationServerURI = "http://mygridserver.com:8003" +[FriendsService] + ; + ; change this to your grid-wide friends server + ; + FriendsServerURI = "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 36cefdc..b567817 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -42,4 +42,4 @@ AllowHypergridMapSearch = true [Friends] - Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" + Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" -- cgit v1.1 From 774958bbbf639090e73204be1d5b6d5c7653441a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 28 Feb 2010 16:09:06 -0800 Subject: Added FriendsData to both Null storage and SQLite. Untested. --- bin/config-include/Standalone.ini | 4 ++++ bin/config-include/StandaloneHypergrid.ini | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index ce77b3f..b35f8a5 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -59,6 +59,10 @@ GridService = "OpenSim.Services.GridService.dll:GridService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" +[FriendsService] + LocalServiceModule = "OpenSim.Services.FriendsService.dll" + ConnectionString = "URI=file:friends.db,version=3" + [Friends] Connector = "OpenSim.Services.FriendsService.dll" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index ecdd6f7..ee84c81 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -77,6 +77,10 @@ GridService = "OpenSim.Services.GridService.dll:GridService" InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" +[FriendsService] + LocalServiceModule = "OpenSim.Services.FriendsService.dll" + ConnectionString = "URI=file:friends.db,version=3" + [Friends] Connector = "OpenSim.Services.FriendsService.dll" -- cgit v1.1