aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorJohn Hurliman2009-09-30 15:28:23 -0700
committerJohn Hurliman2009-09-30 15:28:23 -0700
commitacfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch)
tree305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /bin/config-include
parent* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2
opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Grid.ini7
-rw-r--r--bin/config-include/GridCommon.ini.example5
-rw-r--r--bin/config-include/GridHypergrid.ini14
-rw-r--r--bin/config-include/Standalone.ini5
-rw-r--r--bin/config-include/StandaloneCommon.ini.example7
-rw-r--r--bin/config-include/StandaloneHypergrid.ini16
6 files changed, 51 insertions, 3 deletions
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 @@
12 InventoryServices = "RemoteInventoryServicesConnector" 12 InventoryServices = "RemoteInventoryServicesConnector"
13 AuthorizationServices = "RemoteAuthorizationServicesConnector" 13 AuthorizationServices = "RemoteAuthorizationServicesConnector"
14 NeighbourServices = "RemoteNeighbourServicesConnector" 14 NeighbourServices = "RemoteNeighbourServicesConnector"
15 GridServices = "RemoteGridServicesConnector"
15 NeighbourServiceInConnector = true 16 NeighbourServiceInConnector = true
16 LandServiceInConnector = true 17 LandServiceInConnector = true
18
19[GridService]
20 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
21 ; for the LocalGridServicesConnector which is used by the Remote one
22 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
23 \ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
15 ; 15 ;
16 InventoryServerURI = "http://myinventoryserver.com:8004" 16 InventoryServerURI = "http://myinventoryserver.com:8004"
17 17
18[GridService]
19 ;
20 ; change this to your grid-wide inventory server
21 ;
22 GridServerURI = "http://mygridserver.com:8001"
18 23
19[Modules] 24[Modules]
20 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 25 ;; 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..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,13 +7,17 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
10[Modules] 13[Modules]
11 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
13 NeighbourServices = "RemoteNeighbourServicesConnector" 16 NeighbourServices = "RemoteNeighbourServicesConnector"
17 GridServices = "HGGridServicesConnector"
14 NeighbourServiceInConnector = true 18 NeighbourServiceInConnector = true
15 LandServiceInConnector = true 19 LandServiceInConnector = true
16 20 HypergridServiceInConnector = true
17 21
18[AssetService] 22[AssetService]
19 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 23 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +26,11 @@
22[InventoryService] 26[InventoryService]
23 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" 27 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
24 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" 28 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
29
30[GridService]
31 ; for the HGGridServicesConnector to instantiate
32 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
33 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
34 ; which in turn uses this
35 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
36 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
12 InventoryServices = "LocalInventoryServicesConnector" 12 InventoryServices = "LocalInventoryServicesConnector"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "LocalGridServicesConnector"
15 16
16[AssetService] 17[AssetService]
17 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 18 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
21 22
22[AuthorizationService] 23[AuthorizationService]
23 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 24 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
25
26[GridService]
27 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
28 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 @@
32[FreeswitchService] 32[FreeswitchService]
33 ;; Configuration for the freeswitch service goes here 33 ;; Configuration for the freeswitch service goes here
34 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 34 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
35
36[GridService]
37 ;; For in-memory region storage (default)
38 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
39 ;;--- For MySql region storage (alternative)
40 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
41 ;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 aa122be..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,14 +7,21 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini" 8 Include-Common = "config-include/StandaloneCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
10[Modules] 13[Modules]
11 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
13 NeighbourServices = "LocalNeighbourServicesConnector" 16 NeighbourServices = "RemoteNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 17 AuthorizationServices = "LocalAuthorizationServicesConnector"
18 GridServices = "HGGridServicesConnector"
15 InventoryServiceInConnector = true 19 InventoryServiceInConnector = true
16 AssetServiceInConnector = true 20 AssetServiceInConnector = true
17 HGAuthServiceInConnector = true 21 HGAuthServiceInConnector = true
22 HypergridServiceInConnector = true
23 NeighbourServiceInConnector = true
24
18 25
19[AssetService] 26[AssetService]
20 ; For the AssetServiceInConnector 27 ; For the AssetServiceInConnector
@@ -39,4 +46,9 @@
39 ; For the HGAuthServiceInConnector 46 ; For the HGAuthServiceInConnector
40 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" 47 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
41 48
42 \ No newline at end of file 49[GridService]
50 ; for the HGGridServicesConnector to instantiate
51 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
52 ; LocalGridServicesConnector needs this
53 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54 Realm = "regions"