Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs

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
                     }
                 }
 
-                string grant = startupConfig.GetString("AllowedClients", String.Empty);
+                string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
+
+                string grant 
+                    = Util.GetConfigVarFromSections<string>(
+                        config, "AllowedClients", possibleAccessControlConfigSections, "");
+
                 if (grant.Length > 0)
                 {
                     foreach (string viewer in grant.Split(','))
@@ -965,7 +970,10 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                grant = startupConfig.GetString("BannedClients", String.Empty);
+                grant 
+                    = Util.GetConfigVarFromSections<string>(
+                        config, "BannedClients", possibleAccessControlConfigSections, "");
+
                 if (grant.Length > 0)
                 {
                     foreach (string viewer in grant.Split(','))