aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-02 01:43:54 +0000
committerJustin Clark-Casey (justincc)2013-03-02 01:43:54 +0000
commit1bc8692a999f4e80b90b9a1eb7c7428b2e74214e (patch)
treef9066e9e5a1645b646b44fff8195073d54dc06ab /OpenSim
parentRevert "Removed more vars from [Startup]. I think these were already moved el... (diff)
downloadopensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.zip
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.gz
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.bz2
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.xz
Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
Diffstat (limited to 'OpenSim')
-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 5b61538..14dac7a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -932,7 +932,12 @@ namespace OpenSim.Region.Framework.Scenes
932 } 932 }
933 } 933 }
934 934
935 string grant = startupConfig.GetString("AllowedClients", String.Empty); 935 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
936
937 string grant
938 = Util.GetConfigVarFromSections<string>(
939 config, "AllowedClients", possibleAccessControlConfigSections, "");
940
936 if (grant.Length > 0) 941 if (grant.Length > 0)
937 { 942 {
938 foreach (string viewer in grant.Split('|')) 943 foreach (string viewer in grant.Split('|'))
@@ -941,7 +946,10 @@ namespace OpenSim.Region.Framework.Scenes
941 } 946 }
942 } 947 }
943 948
944 grant = startupConfig.GetString("BannedClients", String.Empty); 949 grant
950 = Util.GetConfigVarFromSections<string>(
951 config, "BannedClients", possibleAccessControlConfigSections, "");
952
945 if (grant.Length > 0) 953 if (grant.Length > 0)
946 { 954 {
947 foreach (string viewer in grant.Split('|')) 955 foreach (string viewer in grant.Split('|'))