aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-10-01 14:08:15 +0100
committerMelanie2009-10-01 14:08:15 +0100
commit41ff39414bc70ef645e2180693792c83d61a7539 (patch)
treedc711428d4c8fed07791263ff4dfea142d54e4e7 /bin
parentMerge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff)
parent- adding new LandDataSerializer testcase to "test-xml" target as well (diff)
downloadopensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.zip
opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz
opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2
opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.GridServer.ini.example2
-rw-r--r--bin/OpenSim.Server.ini.example11
-rw-r--r--bin/OpenSim.ini.example2
-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.ini3
-rw-r--r--bin/config-include/StandaloneCommon.ini.example7
-rw-r--r--bin/config-include/StandaloneHypergrid.ini13
9 files changed, 55 insertions, 9 deletions
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 @@
13; * server instance 13; * server instance
14; * 14; *
15[Network] 15[Network]
16 port = 8002 16 port = 8001
17 17
18; * The following are for the remote console 18; * The following are for the remote console
19; * They have no effect for the local or basic console types 19; * They have no effect for the local or basic console types
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 @@
9; * enable the experimental authentication service 9; * enable the experimental authentication service
10; * 10; *
11[Startup] 11[Startup]
12ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector" 12ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector"
13 13
14; * This is common for all services, it's the network setup for the entire 14; * This is common for all services, it's the network setup for the entire
15; * server instance 15; * server instance
@@ -70,3 +70,12 @@ StorageProvider = "OpenSim.Data.MySQL.dll"
70ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 70ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
71; Realm = "users" 71; Realm = "users"
72 72
73; * This is the new style grid service.
74; * "Realm" is the table that is used for user lookup.
75; * It defaults to "regions", which uses the legacy tables
76; *
77[GridService]
78 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
79 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
80 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
81 Realm = "regions"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 97e6354..2a8a7bb 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -326,7 +326,7 @@
326 326
327 ; The MessagingServer is a companion of the UserServer. It uses 327 ; The MessagingServer is a companion of the UserServer. It uses
328 ; user_send_key and user_recv_key, too 328 ; user_send_key and user_recv_key, too
329 messaging_server_url = "http://127.0.0.1:8006" 329 ;messaging_server_url = "http://127.0.0.1:8006"
330 330
331 ; What is reported as the "X-Secondlife-Shard" 331 ; What is reported as the "X-Secondlife-Shard"
332 ; Defaults to the user server url if not set 332 ; Defaults to the user server url if not set
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 5a5cbff..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
25 25
26[GridService] 26[GridService]
27 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 27 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
28 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 28 Realm = "regions"
29 \ No newline at end of file
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 b14517d..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,16 +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"
15 GridServices = "HGGridServicesConnector" 18 GridServices = "HGGridServicesConnector"
16 InventoryServiceInConnector = true 19 InventoryServiceInConnector = true
17 AssetServiceInConnector = true 20 AssetServiceInConnector = true
18 HGAuthServiceInConnector = true 21 HGAuthServiceInConnector = true
19 HypergridServiceInConnector = true 22 HypergridServiceInConnector = true
23 NeighbourServiceInConnector = true
24
20 25
21[AssetService] 26[AssetService]
22 ; For the AssetServiceInConnector 27 ; For the AssetServiceInConnector
@@ -42,6 +47,8 @@
42 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" 47 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
43 48
44[GridService] 49[GridService]
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 50 ; for the HGGridServicesConnector to instantiate
46 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" 51 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
47 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file 52 ; LocalGridServicesConnector needs this
53 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54 Realm = "regions"