From 75ab9b4b882feb8645ccc2904b11aebb9ae06e64 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 12 Jul 2012 23:18:30 +0100
Subject: Change very recent AllowedViewerList and BannedViewerList config
 setting names in OpenSim.ini.example to AllowedClients and BannedClients to
 match long-existing settings in [LoginService]

Also changes separator from comma to bar to match existing [LoginService] config features.
Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 25223b9..3e9583c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -782,19 +782,19 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                string grant = startupConfig.GetString("AllowedViewerList", String.Empty);
+                string grant = startupConfig.GetString("AllowedClients", String.Empty);
                 if (grant.Length > 0)
                 {
-                    foreach (string viewer in grant.Split(','))
+                    foreach (string viewer in grant.Split('|'))
                     {
                         m_AllowedViewers.Add(viewer.Trim().ToLower());
                     }
                 }
 
-                grant = startupConfig.GetString("BannedViewerList", String.Empty);
+                grant = startupConfig.GetString("BannedClients", String.Empty);
                 if (grant.Length > 0)
                 {
-                    foreach (string viewer in grant.Split(','))
+                    foreach (string viewer in grant.Split('|'))
                     {
                         m_BannedViewers.Add(viewer.Trim().ToLower());
                     }
-- 
cgit v1.1