Merge branch 'master' into careminster

2 files changed, 93 insertions, 112 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e3b605b..0f4d6df 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -216,50 +216,6 @@
     ; physics = basicphysics
     ; physics = POS
 
-    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
-    ;; Permission modules to use, separated by comma.
-    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
-    ; permissionmodules = DefaultPermissionsModule
-
-    ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
-    ;; These are the parameters for the default permissions module
-    ;;
-    ;; If set to false, then, in theory, the server never carries out
-    ;; permission checks (allowing anybody to copy
-    ;; any item, etc.  This may not yet be implemented uniformally.
-    ;; If set to true, then all permissions checks are carried out
-    ; serverside_object_permissions = true
-
-    ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
-    ;; This allows users with a UserLevel of 200 or more to assume god
-    ;; powers in the regions in this simulator.
-    ; allow_grid_gods = false
-
-    ;; This allows some control over permissions
-    ;; please note that this still doesn't duplicate SL, and is not intended to
-    ;# {region_owner_is_god} {} {Allow region owner gods} {true false} true
-    ;; Allow region owners to assume god powers in their regions
-    ; region_owner_is_god = true
-
-    ;# {region_manager_is_god} {} {Allow region manager gods} {true false} false
-    ;; Allow region managers to assume god powers in regions they manage
-    ; region_manager_is_god = false
-
-    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
-    ;; Allow parcel owners to assume god powers in their parcels
-    ; parcel_owner_is_god = true
-
-    ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
-    ;; More control over permissions
-    ;; This is definitely not SL!
-    ;; Provides a simple control for land owners to give build rights to
-    ;; specific avatars in publicly accessible parcels that disallow object
-    ;; creation in general. 
-    ;; Owners specific avatars by adding them to the Access List of the parcel
-    ;; without having to use the Groups feature
-    ; simple_build_permissions = false
-
-
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use. Currently, we only have XEngine
     ; DefaultScriptEngine = "XEngine"
@@ -296,26 +252,6 @@
     ;; default is false
     ; TelehubAllowLandmark = false
 
-    ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
-    ;; 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
-    ;; versions
-    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
-    ;; - "Imprudence" has access
-    ;; - "Imprudence 1.3" has access
-    ;; - "Imprudence 1.3.1" has no access
-    ; AllowedViewerList = 
-
-    ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
-    ;# Bar (|) separated list of viewers which may not gain access to the regions.
-    ;; One can use a Substring of the viewer name to disable only certain
-    ;; versions
-    ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
-    ;; - "Imprudence" has no access
-    ;; - "Imprudence 1.3" has no access
-    ;; - "Imprudence 1.3.1" has access
-    ; BannedViewerList = 
-
 [Map]
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
     ;; Map tile options.  
@@ -350,6 +286,50 @@
     ;; got a large number of objects, so you can turn it off here if you'd like.
     ; DrawPrimOnMapTile = true
 
+[Permissions]
+    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
+    ;; Permission modules to use, separated by comma.
+    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
+    ; permissionmodules = DefaultPermissionsModule
+
+    ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
+    ;; These are the parameters for the default permissions module
+    ;;
+    ;; If set to false, then, in theory, the server never carries out
+    ;; permission checks (allowing anybody to copy
+    ;; any item, etc.  This may not yet be implemented uniformally.
+    ;; If set to true, then all permissions checks are carried out
+    ; serverside_object_permissions = true
+
+    ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
+    ;; This allows users with a UserLevel of 200 or more to assume god
+    ;; powers in the regions in this simulator.
+    ; allow_grid_gods = false
+
+    ;; This allows some control over permissions
+    ;; please note that this still doesn't duplicate SL, and is not intended to
+    ;# {region_owner_is_god} {} {Allow region owner gods} {true false} true
+    ;; Allow region owners to assume god powers in their regions
+    ; region_owner_is_god = true
+
+    ;# {region_manager_is_god} {} {Allow region manager gods} {true false} false
+    ;; Allow region managers to assume god powers in regions they manage
+    ; region_manager_is_god = false
+
+    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
+    ;; Allow parcel owners to assume god powers in their parcels
+    ; parcel_owner_is_god = true
+
+    ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
+    ;; More control over permissions
+    ;; This is definitely not SL!
+    ;; Provides a simple control for land owners to give build rights to
+    ;; specific avatars in publicly accessible parcels that disallow object
+    ;; creation in general. 
+    ;; Owners specific avatars by adding them to the Access List of the parcel
+    ;; without having to use the Groups feature
+    ; simple_build_permissions = false
+
 
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0a66523..5460910 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -227,54 +227,6 @@
     ;physics = BulletSim
 
     ; ##
-    ; ## PERMISSIONS
-    ; ##
-
-    ;permissionmodules = "DefaultPermissionsModule"
-
-    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
-    ; any item, etc.  This may not yet be implemented uniformally.
-    ; If set to true, then all permissions checks are carried out
-    ; Default is true
-    serverside_object_permissions = true
-
-    allow_grid_gods = false
-
-    ; This allows somne control over permissions
-    ; please note that this still doesn't duplicate SL, and is not intended to
-    ;region_owner_is_god = true
-    ;region_manager_is_god = false
-    ;parcel_owner_is_god = true
-
-    ; Control user types that are allowed to create new scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can create scripts (subject to normal permissions)
-    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
-    ; Default value is all
-    ; allowed_script_creators = all
-
-    ; Control user types that are allowed to edit (save) scripts
-    ; Only enforced if serviceside_object_permissions is true
-    ;
-    ; Current possible values are
-    ;     all - anyone can edit scripts (subject to normal permissions)
-    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
-    ; Default value is all
-    ; allowed_script_editors = all
-
-    ; Provides a simple control for land owners to give build rights to specific avatars
-    ; in publicly accessible parcels that disallow object creation in general. 
-    ; Owners specific avatars by adding them to the Access List of the parcel
-    ; without having to use the Groups feature
-    ; Disabled by default
-    ; simple_build_permissions = False
-
-    ; Minimum user level required to upload assets
-    ;LevelUpload = 0
-
-    ; ##
     ; ## SCRIPT ENGINE
     ; ##
 
@@ -340,6 +292,55 @@
     ; Use terrain texture for maptiles if true, use shaded green if false
     TextureOnMapTile = true
 
+[Permissions]
+    ; ##
+    ; ## PERMISSIONS
+    ; ##
+
+    ;permissionmodules = "DefaultPermissionsModule"
+
+    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
+    ; any item, etc.  This may not yet be implemented uniformally.
+    ; If set to true, then all permissions checks are carried out
+    ; Default is true
+    serverside_object_permissions = true
+
+    allow_grid_gods = false
+
+    ; This allows somne control over permissions
+    ; please note that this still doesn't duplicate SL, and is not intended to
+    ;region_owner_is_god = true
+    ;region_manager_is_god = false
+    ;parcel_owner_is_god = true
+
+    ; Control user types that are allowed to create new scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can create scripts (subject to normal permissions)
+    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_creators = all
+
+    ; Control user types that are allowed to edit (save) scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can edit scripts (subject to normal permissions)
+    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_editors = all
+
+    ; Provides a simple control for land owners to give build rights to specific avatars
+    ; in publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; Disabled by default
+    ; simple_build_permissions = False
+
+    ; Minimum user level required to upload assets
+    ;LevelUpload = 0
+
 
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled