aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorDiva Canto2015-09-06 10:00:20 -0700
committerDiva Canto2015-09-06 10:00:20 -0700
commit82ea4179da7ea32ea2efbd1cb209c77d5871b3fd (patch)
tree8365dadb8e02955f378e0baadad125a49118f0a7 /OpenSim/Services/LLLoginService/LLLoginService.cs
parentRelated to previous commits: fixed namespace. (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index d67bc4d..10c2e8c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -123,8 +123,12 @@ namespace OpenSim.Services.LLLoginService
123 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); 123 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
124 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); 124 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
125 125
126 m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); 126 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "LoginService" };
127 m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); 127 m_AllowedClients = Util.GetConfigVarFromSections<string>(
128 config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
129 m_DeniedClients = Util.GetConfigVarFromSections<string>(
130 config, "DeniedClients", possibleAccessControlConfigSections, string.Empty);
131
128 m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); 132 m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
129 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); 133 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
130 134