aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs7
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs8
3 files changed, 18 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8c2f45e..dce2247 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1051,11 +1051,11 @@ namespace OpenSim.Region.Framework.Scenes
1051 } 1051 }
1052 } 1052 }
1053 1053
1054 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" }; 1054 string[] possibleAccessControlConfigSections = new string[] { "Startup", "AccessControl"};
1055 1055
1056 string grant 1056 string grant
1057 = Util.GetConfigVarFromSections<string>( 1057 = Util.GetConfigVarFromSections<string>(
1058 config, "AllowedClients", possibleAccessControlConfigSections, ""); 1058 config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
1059 1059
1060 if (grant.Length > 0) 1060 if (grant.Length > 0)
1061 { 1061 {
@@ -1067,7 +1067,11 @@ namespace OpenSim.Region.Framework.Scenes
1067 1067
1068 grant 1068 grant
1069 = Util.GetConfigVarFromSections<string>( 1069 = Util.GetConfigVarFromSections<string>(
1070 config, "BannedClients", possibleAccessControlConfigSections, ""); 1070 config, "DeniedClients", possibleAccessControlConfigSections, String.Empty);
1071 // Deal with the mess of someone having used a different word at some point
1072 if (grant == String.Empty)
1073 grant = Util.GetConfigVarFromSections<string>(
1074 config, "BannedClients", possibleAccessControlConfigSections, String.Empty);
1071 1075
1072 if (grant.Length > 0) 1076 if (grant.Length > 0)
1073 { 1077 {
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);
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