diff options
| author | Justin Clark-Casey (justincc) | 2009-09-11 18:20:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-09-11 18:20:41 +0100 |
| commit | f20a052ef50761a08cade9902d0ffdbc643fad30 (patch) | |
| tree | a48e496d23c5024dfacc774f4943e69cb174c02e /bin | |
| parent | Remove bug where iar created folders could not be deleted after relog (diff) | |
| parent | moved AuthorizationRequest and AuthorizationResponse to IAuthorizationService... (diff) | |
| download | opensim-SC_OLD-f20a052ef50761a08cade9902d0ffdbc643fad30.zip opensim-SC_OLD-f20a052ef50761a08cade9902d0ffdbc643fad30.tar.gz opensim-SC_OLD-f20a052ef50761a08cade9902d0ffdbc643fad30.tar.bz2 opensim-SC_OLD-f20a052ef50761a08cade9902d0ffdbc643fad30.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/Grid.ini | 1 | ||||
| -rw-r--r-- | bin/config-include/Standalone.ini | 4 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 3b8f3a9..10f7dbd 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | [Modules] | 10 | [Modules] |
| 11 | AssetServices = "RemoteAssetServicesConnector" | 11 | AssetServices = "RemoteAssetServicesConnector" |
| 12 | InventoryServices = "RemoteInventoryServicesConnector" | 12 | InventoryServices = "RemoteInventoryServicesConnector" |
| 13 | AuthorizationServices = "RemoteAuthorizationServicesConnector" | ||
| 13 | NeighbourServices = "RemoteNeighbourServicesConnector" | 14 | NeighbourServices = "RemoteNeighbourServicesConnector" |
| 14 | NeighbourServiceInConnector = true | 15 | NeighbourServiceInConnector = true |
| 15 | LandServiceInConnector = true | 16 | LandServiceInConnector = true |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index c187358..24020b6 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
| @@ -11,9 +11,13 @@ | |||
| 11 | AssetServices = "LocalAssetServicesConnector" | 11 | AssetServices = "LocalAssetServicesConnector" |
| 12 | InventoryServices = "LocalInventoryServicesConnector" | 12 | InventoryServices = "LocalInventoryServicesConnector" |
| 13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
| 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
| 14 | 15 | ||
| 15 | [AssetService] | 16 | [AssetService] |
| 16 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 17 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
| 17 | 18 | ||
| 18 | [InventoryService] | 19 | [InventoryService] |
| 19 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 20 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" |
| 21 | |||
| 22 | [AuthorizationService] | ||
| 23 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 6359ac0..aa122be 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | AssetServices = "HGAssetBroker" | 11 | AssetServices = "HGAssetBroker" |
| 12 | InventoryServices = "HGInventoryBroker" | 12 | InventoryServices = "HGInventoryBroker" |
| 13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
| 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
| 14 | InventoryServiceInConnector = true | 15 | InventoryServiceInConnector = true |
| 15 | AssetServiceInConnector = true | 16 | AssetServiceInConnector = true |
| 16 | HGAuthServiceInConnector = true | 17 | HGAuthServiceInConnector = true |
| @@ -31,6 +32,11 @@ | |||
| 31 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 32 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" |
| 32 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" | 33 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" |
| 33 | 34 | ||
| 35 | [AuthorizationService] | ||
| 36 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | ||
| 37 | |||
| 34 | [AuthenticationService] | 38 | [AuthenticationService] |
| 35 | ; For the HGAuthServiceInConnector | 39 | ; For the HGAuthServiceInConnector |
| 36 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" \ No newline at end of file | 40 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" |
| 41 | |||
| 42 | \ No newline at end of file | ||