aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b03fee0..d459b56 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -956,7 +956,12 @@ namespace OpenSim.Region.Framework.Scenes
956 } 956 }
957 } 957 }
958 958
959 string grant = startupConfig.GetString("AllowedClients", String.Empty); 959 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
960
961 string grant
962 = Util.GetConfigVarFromSections<string>(
963 config, "AllowedClients", possibleAccessControlConfigSections, "");
964
960 if (grant.Length > 0) 965 if (grant.Length > 0)
961 { 966 {
962 foreach (string viewer in grant.Split(',')) 967 foreach (string viewer in grant.Split(','))
@@ -965,7 +970,10 @@ namespace OpenSim.Region.Framework.Scenes
965 } 970 }
966 } 971 }
967 972
968 grant = startupConfig.GetString("BannedClients", String.Empty); 973 grant
974 = Util.GetConfigVarFromSections<string>(
975 config, "BannedClients", possibleAccessControlConfigSections, "");
976
969 if (grant.Length > 0) 977 if (grant.Length > 0)
970 { 978 {
971 foreach (string viewer in grant.Split(',')) 979 foreach (string viewer in grant.Split(','))