diff options
| author | Justin Clark-Casey (justincc) | 2012-07-12 23:18:30 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-12 23:18:30 +0100 |
| commit | 75ab9b4b882feb8645ccc2904b11aebb9ae06e64 (patch) | |
| tree | 0eb11cce3c65cf9dd578db50d1f026188776f842 /OpenSim/Region | |
| parent | Extend "show circuits" to show circuit code, ip and viewer name. (diff) | |
| download | opensim-SC_OLD-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.zip opensim-SC_OLD-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.tar.gz opensim-SC_OLD-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.tar.bz2 opensim-SC_OLD-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
| 782 | } | 782 | } |
| 783 | } | 783 | } |
| 784 | 784 | ||
| 785 | string grant = startupConfig.GetString("AllowedViewerList", String.Empty); | 785 | string grant = startupConfig.GetString("AllowedClients", String.Empty); |
| 786 | if (grant.Length > 0) | 786 | if (grant.Length > 0) |
| 787 | { | 787 | { |
| 788 | foreach (string viewer in grant.Split(',')) | 788 | foreach (string viewer in grant.Split('|')) |
| 789 | { | 789 | { |
| 790 | m_AllowedViewers.Add(viewer.Trim().ToLower()); | 790 | m_AllowedViewers.Add(viewer.Trim().ToLower()); |
| 791 | } | 791 | } |
| 792 | } | 792 | } |
| 793 | 793 | ||
| 794 | grant = startupConfig.GetString("BannedViewerList", String.Empty); | 794 | grant = startupConfig.GetString("BannedClients", String.Empty); |
| 795 | if (grant.Length > 0) | 795 | if (grant.Length > 0) |
| 796 | { | 796 | { |
| 797 | foreach (string viewer in grant.Split(',')) | 797 | foreach (string viewer in grant.Split('|')) |
| 798 | { | 798 | { |
| 799 | m_BannedViewers.Add(viewer.Trim().ToLower()); | 799 | m_BannedViewers.Add(viewer.Trim().ToLower()); |
| 800 | } | 800 | } |