aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-11 21:18:53 +0100
committerJustin Clark-Casey (justincc)2010-06-11 21:18:53 +0100
commit8531da37d44e11e295f7c738c721285722745e45 (patch)
treed3b564300cefb0de632fa0eadfaed57772c2832e /bin
parentcreate inactive test for iar folders/items merged with existing paths (diff)
parentReinstated the check on im.binaryBucket.Length, this time on the local handle... (diff)
downloadopensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.zip
opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.gz
opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.bz2
opensim-SC_OLD-8531da37d44e11e295f7c738c721285722745e45.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 38febc2..b14206a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -935,6 +935,9 @@
935 935
936 ; Allow the use of os* functions (some are dangerous) 936 ; Allow the use of os* functions (some are dangerous)
937 AllowOSFunctions = false 937 AllowOSFunctions = false
938
939 ; Allow the user of LightShare functions
940 AllowLightShareFunctions = false
938 941
939 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe 942 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
940 OSFunctionThreatLevel = VeryLow 943 OSFunctionThreatLevel = VeryLow