diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 7 insertions, 3 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 | { |