diff options
| author | Melanie | 2009-09-27 21:25:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-27 21:25:10 +0100 |
| commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
| tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /bin/config-include | |
| parent | Add the Migration for the regions table (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to 'bin/config-include')
| -rw-r--r-- | bin/config-include/Standalone.ini | 6 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 24020b6..5a5cbff 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,8 @@ | |||
| 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 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | ||
| 29 | \ No newline at end of file | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index aa122be..b14517d 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -12,9 +12,11 @@ | |||
| 12 | InventoryServices = "HGInventoryBroker" | 12 | InventoryServices = "HGInventoryBroker" |
| 13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
| 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" |
| 15 | GridServices = "HGGridServicesConnector" | ||
| 15 | InventoryServiceInConnector = true | 16 | InventoryServiceInConnector = true |
| 16 | AssetServiceInConnector = true | 17 | AssetServiceInConnector = true |
| 17 | HGAuthServiceInConnector = true | 18 | HGAuthServiceInConnector = true |
| 19 | HypergridServiceInConnector = true | ||
| 18 | 20 | ||
| 19 | [AssetService] | 21 | [AssetService] |
| 20 | ; For the AssetServiceInConnector | 22 | ; For the AssetServiceInConnector |
| @@ -39,4 +41,7 @@ | |||
| 39 | ; For the HGAuthServiceInConnector | 41 | ; For the HGAuthServiceInConnector |
| 40 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" | 42 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" |
| 41 | 43 | ||
| 42 | \ No newline at end of file | 44 | [GridService] |
| 45 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
| 46 | GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" | ||
| 47 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file | ||