OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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]
user_profiles
Justin Clark-Casey (justincc) 2013-03-02 01:43:54 +00:00
parent 4999d7920a
commit 1bc8692a99
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

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

8
bin/OpenSim.ini.example
View File

@ -256,6 +256,8 @@
;; default is false ;; default is false
; TelehubAllowLandmark = false ; TelehubAllowLandmark = false
[AccessControl]
;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {} ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
;; Bar (|) separated list of viewers which may gain access to the regions. ;; Bar (|) separated list of viewers which may gain access to the regions.
;; One can use a substring of the viewer name to enable only certain ;; One can use a substring of the viewer name to enable only certain
@ -264,7 +266,7 @@
;; - "Imprudence" has access ;; - "Imprudence" has access
;; - "Imprudence 1.3" has access ;; - "Imprudence 1.3" has access
;; - "Imprudence 1.3.1" has no access ;; - "Imprudence 1.3.1" has no access
; AllowedViewerList = ; AllowedClients =
;# {BannedClients} {} {Bar (|) separated list of banned clients} {} ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
;# Bar (|) separated list of viewers which may not gain access to the regions. ;# Bar (|) separated list of viewers which may not gain access to the regions.
@ -274,7 +276,8 @@
;; - "Imprudence" has no access ;; - "Imprudence" has no access
;; - "Imprudence 1.3" has no access ;; - "Imprudence 1.3" has no access
;; - "Imprudence 1.3.1" has access ;; - "Imprudence 1.3.1" has access
; BannedViewerList = ; BannedClients =
[Map] [Map]
;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
@ -310,6 +313,7 @@
;; got a large number of objects, so you can turn it off here if you'd like. ;; got a large number of objects, so you can turn it off here if you'd like.
; DrawPrimOnMapTile = true ; DrawPrimOnMapTile = true
[Permissions] [Permissions]
;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
;; Permission modules to use, separated by comma. ;; Permission modules to use, separated by comma.