diff options
| author | Melanie | 2013-06-04 21:09:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-04 21:09:25 +0100 |
| commit | 648e258b8e79e52df18f41f2ec79016a095f7766 (patch) | |
| tree | de96993d11a0183ac026cec61e0e5a937f801c3c /bin/config-include/StandaloneHypergrid.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff) | |
| download | opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index ba92030..39c33e8 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | GridUserServices = "LocalGridUserServicesConnector" | 19 | GridUserServices = "LocalGridUserServicesConnector" |
| 20 | SimulationServices = "RemoteSimulationConnectorModule" | 20 | SimulationServices = "RemoteSimulationConnectorModule" |
| 21 | AvatarServices = "LocalAvatarServicesConnector" | 21 | AvatarServices = "LocalAvatarServicesConnector" |
| 22 | UserProfilesServices = "LocalUserProfilesServicesConnector" | ||
| 22 | MapImageService = "MapImageServiceModule" | 23 | MapImageService = "MapImageServiceModule" |
| 23 | EntityTransferModule = "HGEntityTransferModule" | 24 | EntityTransferModule = "HGEntityTransferModule" |
| 24 | InventoryAccessModule = "HGInventoryAccessModule" | 25 | InventoryAccessModule = "HGInventoryAccessModule" |
| @@ -184,7 +185,6 @@ | |||
| 184 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 185 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 185 | InGatekeeper = True | 186 | InGatekeeper = True |
| 186 | 187 | ||
| 187 | |||
| 188 | ;; This should always be the very last thing on this file | 188 | ;; This should always be the very last thing on this file |
| 189 | [Includes] | 189 | [Includes] |
| 190 | Include-Common = "config-include/StandaloneCommon.ini" | 190 | Include-Common = "config-include/StandaloneCommon.ini" |