diff options
author | Diva Canto | 2015-09-06 10:00:20 -0700 |
---|---|---|
committer | Diva Canto | 2015-09-06 10:00:20 -0700 |
commit | 82ea4179da7ea32ea2efbd1cb209c77d5871b3fd (patch) | |
tree | 8365dadb8e02955f378e0baadad125a49118f0a7 /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Related to previous commits: fixed namespace. (diff) | |
download | opensim-SC_OLD-82ea4179da7ea32ea2efbd1cb209c77d5871b3fd.zip opensim-SC_OLD-82ea4179da7ea32ea2efbd1cb209c77d5871b3fd.tar.gz opensim-SC_OLD-82ea4179da7ea32ea2efbd1cb209c77d5871b3fd.tar.bz2 opensim-SC_OLD-82ea4179da7ea32ea2efbd1cb209c77d5871b3fd.tar.xz |
Clean up viewer-based access control specifications.
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-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); |