From 632bb7126277b6e8b524b76fb181a079b51adcf4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 08:49:48 -0700 Subject: Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist. --- bin/OpenSim.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 7a65efe..8055ba4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -326,7 +326,7 @@ ; 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" + ;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 -- cgit v1.1 From ae222140ca6984750f53716088b6df165d8a35e5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 10:08:59 -0700 Subject: Finished spec-ing the .inis for the new grid service modules. --- bin/config-include/Grid.ini | 7 +++++++ bin/config-include/GridCommon.ini.example | 5 +++++ bin/config-include/GridHypergrid.ini | 11 ++++++++++- bin/config-include/Standalone.ini | 3 +-- bin/config-include/StandaloneCommon.ini.example | 7 +++++++ bin/config-include/StandaloneHypergrid.ini | 6 ++++-- 6 files changed, 34 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 10f7dbd..261c1b8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -12,5 +12,12 @@ InventoryServices = "RemoteInventoryServicesConnector" AuthorizationServices = "RemoteAuthorizationServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" + GridServices = "RemoteGridServicesConnector" NeighbourServiceInConnector = true LandServiceInConnector = true + +[GridService] + 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 diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 3a8ec35..2724c42 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -15,6 +15,11 @@ ; InventoryServerURI = "http://myinventoryserver.com:8004" +[GridService] + ; + ; change this to your grid-wide inventory server + ; + GridServerURI = "http://mygridserver.com:8002" [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 8b65ab8..1bfcf89 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -11,9 +11,10 @@ AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" NeighbourServices = "RemoteNeighbourServicesConnector" + GridServices = "HGGridServicesConnector" NeighbourServiceInConnector = true LandServiceInConnector = true - + HypergridServiceInConnector = true [AssetService] LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" @@ -22,3 +23,11 @@ [InventoryService] LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" 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" diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 5a5cbff..a6c089c 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -25,5 +25,4 @@ [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" - StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" - \ No newline at end of file + Realm = "regions" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index bac7983..b0e2de3 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -32,3 +32,10 @@ [FreeswitchService] ;; Configuration for the freeswitch service goes here LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" + +[GridService] + ;; For in-memory region storage (default) + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + ;;--- For MySql region storage (alternative) + ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" + ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index b14517d..793f4d5 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -42,6 +42,8 @@ LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" [GridService] - LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + ; for the HGGridServicesConnector to instantiate GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" - StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file + ; LocalGridServicesConnector needs this + LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + Realm = "regions" -- cgit v1.1 From 368ae02dc9f7786545342d7bffae5de28678e85f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 10:18:22 -0700 Subject: Corrected the port number to 8001 in the test client and grid ini. --- bin/config-include/GridCommon.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 2724c42..e9d3728 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -19,7 +19,7 @@ ; ; change this to your grid-wide inventory server ; - GridServerURI = "http://mygridserver.com:8002" + GridServerURI = "http://mygridserver.com:8001" [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. -- cgit v1.1 From 8b2b8801e63fbcf5252e5ddbb40438e224025348 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 14:32:03 -0700 Subject: Fixed port in GridServer.ini. Added new configs for StandaloneHypergrid.ini --- bin/OpenSim.GridServer.ini.example | 2 +- bin/config-include/StandaloneHypergrid.ini | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.GridServer.ini.example b/bin/OpenSim.GridServer.ini.example index 695bf9e..8bd126f 100644 --- a/bin/OpenSim.GridServer.ini.example +++ b/bin/OpenSim.GridServer.ini.example @@ -13,7 +13,7 @@ ; * server instance ; * [Network] - port = 8002 + port = 8001 ; * The following are for the remote console ; * They have no effect for the local or basic console types diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 793f4d5..75cdad9 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -10,13 +10,15 @@ [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" - NeighbourServices = "LocalNeighbourServicesConnector" + NeighbourServices = "RemoteNeighbourServicesConnector" AuthorizationServices = "LocalAuthorizationServicesConnector" GridServices = "HGGridServicesConnector" InventoryServiceInConnector = true AssetServiceInConnector = true HGAuthServiceInConnector = true HypergridServiceInConnector = true + NeighbourServiceInConnector = true + [AssetService] ; For the AssetServiceInConnector -- cgit v1.1 From de481139626638a9c1becc63bf86d0ec12215163 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Sep 2009 06:08:35 -0700 Subject: Added GridService section to OpenSim.Server.ini.example --- bin/OpenSim.Server.ini.example | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 5696f07..635ba1e 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -9,7 +9,7 @@ ; * enable the experimental authentication service ; * [Startup] -ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector" +ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance @@ -70,3 +70,12 @@ StorageProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" ; Realm = "users" +; * 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" -- cgit v1.1