diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Services/HypergridService | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 44b26d5..87c6810 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -131,8 +131,11 @@ namespace OpenSim.Services.HypergridService | |||
| 131 | else if (simulationService != string.Empty) | 131 | else if (simulationService != string.Empty) |
| 132 | m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args); | 132 | m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args); |
| 133 | 133 | ||
| 134 | m_AllowedClients = serverConfig.GetString("AllowedClients", string.Empty); | 134 | string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "GatekeeperService" }; |
| 135 | m_DeniedClients = serverConfig.GetString("DeniedClients", string.Empty); | 135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
| 136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | ||
| 137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | ||
| 138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | ||
| 136 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); | 139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); |
| 137 | 140 | ||
| 138 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); | 141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); |