diff options
author | John Hurliman | 2010-03-07 16:05:12 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-07 16:05:12 -0800 |
commit | d71ed7081b2267ff056927c97ac8ef32466f7b96 (patch) | |
tree | d5308dc67cde3e7aa5c3d323598b49c449529a31 /bin | |
parent | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit syst... (diff) | |
parent | Bug fix: correct name of methods in user accounts connector. (diff) | |
download | opensim-SC-d71ed7081b2267ff056927c97ac8ef32466f7b96.zip opensim-SC-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.gz opensim-SC-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.bz2 opensim-SC-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index ee84c81..1d8e2ef 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -18,7 +18,6 @@ | |||
18 | InventoryAccessModule = "HGInventoryAccessModule" | 18 | InventoryAccessModule = "HGInventoryAccessModule" |
19 | InventoryServiceInConnector = true | 19 | InventoryServiceInConnector = true |
20 | AssetServiceInConnector = true | 20 | AssetServiceInConnector = true |
21 | HGAuthServiceInConnector = true | ||
22 | HypergridServiceInConnector = true | 21 | HypergridServiceInConnector = true |
23 | NeighbourServiceInConnector = true | 22 | NeighbourServiceInConnector = true |
24 | LibraryModule = true | 23 | LibraryModule = true |
@@ -104,7 +103,6 @@ | |||
104 | GridService = "OpenSim.Services.GridService.dll:GridService" | 103 | GridService = "OpenSim.Services.GridService.dll:GridService" |
105 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" | 104 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" |
106 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" | 105 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" |
107 | WelcomeMessage = "Welcome, Avatar!" | ||
108 | 106 | ||
109 | [UserAgentService] | 107 | [UserAgentService] |
110 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" | 108 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" |