aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-02 01:43:54 +0000
committerJustin Clark-Casey (justincc)2013-03-02 01:43:54 +0000
commit1bc8692a999f4e80b90b9a1eb7c7428b2e74214e (patch)
treef9066e9e5a1645b646b44fff8195073d54dc06ab
parentRevert "Removed more vars from [Startup]. I think these were already moved el... (diff)
downloadopensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.zip
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.gz
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.bz2
opensim-SC_OLD-1bc8692a999f4e80b90b9a1eb7c7428b2e74214e.tar.xz
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]
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--bin/OpenSim.ini.example8
2 files changed, 16 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5b61538..14dac7a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -932,7 +932,12 @@ namespace OpenSim.Region.Framework.Scenes
932 } 932 }
933 } 933 }
934 934
935 string grant = startupConfig.GetString("AllowedClients", String.Empty); 935 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
936
937 string grant
938 = Util.GetConfigVarFromSections<string>(
939 config, "AllowedClients", possibleAccessControlConfigSections, "");
940
936 if (grant.Length > 0) 941 if (grant.Length > 0)
937 { 942 {
938 foreach (string viewer in grant.Split('|')) 943 foreach (string viewer in grant.Split('|'))
@@ -941,7 +946,10 @@ namespace OpenSim.Region.Framework.Scenes
941 } 946 }
942 } 947 }
943 948
944 grant = startupConfig.GetString("BannedClients", String.Empty); 949 grant
950 = Util.GetConfigVarFromSections<string>(
951 config, "BannedClients", possibleAccessControlConfigSections, "");
952
945 if (grant.Length > 0) 953 if (grant.Length > 0)
946 { 954 {
947 foreach (string viewer in grant.Split('|')) 955 foreach (string viewer in grant.Split('|'))
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 16e314b..eab1fce 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -256,6 +256,8 @@
256 ;; default is false 256 ;; default is false
257 ; TelehubAllowLandmark = false 257 ; TelehubAllowLandmark = false
258 258
259
260[AccessControl]
259 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {} 261 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
260 ;; Bar (|) separated list of viewers which may gain access to the regions. 262 ;; Bar (|) separated list of viewers which may gain access to the regions.
261 ;; One can use a substring of the viewer name to enable only certain 263 ;; One can use a substring of the viewer name to enable only certain
@@ -264,7 +266,7 @@
264 ;; - "Imprudence" has access 266 ;; - "Imprudence" has access
265 ;; - "Imprudence 1.3" has access 267 ;; - "Imprudence 1.3" has access
266 ;; - "Imprudence 1.3.1" has no access 268 ;; - "Imprudence 1.3.1" has no access
267 ; AllowedViewerList = 269 ; AllowedClients =
268 270
269 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {} 271 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
270 ;# Bar (|) separated list of viewers which may not gain access to the regions. 272 ;# Bar (|) separated list of viewers which may not gain access to the regions.
@@ -274,7 +276,8 @@
274 ;; - "Imprudence" has no access 276 ;; - "Imprudence" has no access
275 ;; - "Imprudence 1.3" has no access 277 ;; - "Imprudence 1.3" has no access
276 ;; - "Imprudence 1.3.1" has access 278 ;; - "Imprudence 1.3.1" has access
277 ; BannedViewerList = 279 ; BannedClients =
280
278 281
279[Map] 282[Map]
280 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true 283 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
@@ -310,6 +313,7 @@
310 ;; got a large number of objects, so you can turn it off here if you'd like. 313 ;; got a large number of objects, so you can turn it off here if you'd like.
311 ; DrawPrimOnMapTile = true 314 ; DrawPrimOnMapTile = true
312 315
316
313[Permissions] 317[Permissions]
314 ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule 318 ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
315 ;; Permission modules to use, separated by comma. 319 ;; Permission modules to use, separated by comma.