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

Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge

avinationmerge
Melanie 2011-10-11 23:15:00 +01:00
parent 20a2b5d63c 844b4f3a16
commit ae8504f8d9
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/OpenSim.ini.example
View File

@ -600,6 +600,25 @@
;; VeryHigh, Severe ;; VeryHigh, Severe
OSFunctionThreatLevel = VeryLow OSFunctionThreatLevel = VeryLow
; OS Functions enable/disable
; For each function, you can add one line, as shown
; The default for all functions allows them if below threat level
; true allows the use of the function unconditionally
; Allow_osSetRegionWaterHeight = true
; false disables the function completely
; Allow_osSetRegionWaterHeight = false
; Comma separated list of UUIDS allows the function for that list of UUIDS
; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
; You can also use script creators as the uuid
; Creators_osSetRegionWaterHeight = <uuid>, ...
; If both Allow_ and Creators_ are given, effective permissions
; are the union of the two.
;; Time a script can spend in an event handler before it is interrupted ;; Time a script can spend in an event handler before it is interrupted
; EventLimit = 30 ; EventLimit = 30

38
bin/OpenSimDefaults.ini
View File

@ -1136,6 +1136,25 @@
; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
OSFunctionThreatLevel = VeryLow OSFunctionThreatLevel = VeryLow
; OS Functions enable/disable
; For each function, you can add one line, as shown
; The default for all functions allows them if below threat level
; true allows the use of the function unconditionally
; Allow_osSetRegionWaterHeight = true
; false disables the function completely
; Allow_osSetRegionWaterHeight = false
; Comma separated list of UUIDS allows the function for that list of UUIDS
; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
; You can also use script creators as the uuid
; Creators_osSetRegionWaterHeight = <uuid>, ...
; If both Allow_ and Creators_ are given, effective permissions
; are the union of the two.
; Interval (s) between background save of script states ; Interval (s) between background save of script states
SaveInterval = 120 SaveInterval = 120
@ -1163,25 +1182,6 @@
SensorMaxRange = 96.0 SensorMaxRange = 96.0
SensorMaxResults = 16 SensorMaxResults = 16
; OS Functions enable/disable
; For each function, you can add one line, as shown
; The default for all functions allows them if below threat level
; true allows the use of the function unconditionally
; Allow_osSetRegionWaterHeight = true
; false disables the function completely
; Allow_osSetRegionWaterHeight = false
; Comma separated list of UUIDS allows the function for that list of UUIDS
; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
; You can also use script creators as the uuid
; Creators_osSetRegionWaterHeight = <uuid>, ...
; If both Allow_ and Creators_ are given, effective permissions
; are the union of the two.
; Allow for llCreateLink and llBreakLink to work without asking for permission ; Allow for llCreateLink and llBreakLink to work without asking for permission
; only enable this in a trusted environment otherwise you may be subject to hijacking ; only enable this in a trusted environment otherwise you may be subject to hijacking
; AutomaticLinkPermission = false ; AutomaticLinkPermission = false