aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-12 23:18:30 +0100
committerJustin Clark-Casey (justincc)2012-07-12 23:18:30 +0100
commit75ab9b4b882feb8645ccc2904b11aebb9ae06e64 (patch)
tree0eb11cce3c65cf9dd578db50d1f026188776f842
parentExtend "show circuits" to show circuit code, ip and viewer name. (diff)
downloadopensim-SC-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.zip
opensim-SC-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.tar.gz
opensim-SC-75ab9b4b882feb8645ccc2904b11aebb9ae06e64.tar.bz2
opensim-SC-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.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--bin/OpenSim.ini.example14
2 files changed, 11 insertions, 11 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 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 33eaccb..9c68b65 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -280,18 +280,18 @@
280 ;; default is false 280 ;; default is false
281 ; TelehubAllowLandmark = false 281 ; TelehubAllowLandmark = false
282 282
283 ;# {AllowedViewerList} {} {Comma separated list of allowed viewers} {} 283 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
284 ;; Comma separated list of viewers which may gain access to the regions. 284 ;; Bar (|) separated list of viewers which may gain access to the regions.
285 ;; One can use a Substring of the viewer name to enable only certain subversions 285 ;; One can use a substring of the viewer name to enable only certain versions
286 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 286 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
287 ;; - "Imprudence" has access 287 ;; - "Imprudence" has access
288 ;; - "Imprudence 1.3" has access 288 ;; - "Imprudence 1.3" has access
289 ;; - "Imprudence 1.3.1" has no access 289 ;; - "Imprudence 1.3.1" has no access
290 ;; AllowedViewerList = 290 ; AllowedViewerList =
291 291
292 ;# {BannedViewerList} {} {Comma separated list of banned viewers} {} 292 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
293 ;# Comma separated list of viewers which may not gain access to the regions. 293 ;# Bar (|) separated list of viewers which may not gain access to the regions.
294 ;; One can use a Substring of the viewer name to disable only certain subversions 294 ;; One can use a Substring of the viewer name to disable only certain versions
295 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 295 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
296 ;; - "Imprudence" has no access 296 ;; - "Imprudence" has no access
297 ;; - "Imprudence 1.3" has no access 297 ;; - "Imprudence 1.3" has no access