diff options
author | Diva Canto | 2015-05-26 15:06:39 -0700 |
---|---|---|
committer | Diva Canto | 2015-05-26 15:06:39 -0700 |
commit | f0533132eb295cc6932b427fd93ccff0d3a8f439 (patch) | |
tree | 3d37992819735ff5ffccff407fbaa9b95aa95ef9 | |
parent | Attachments Module. Fix detach event not being fired until the next time the ... (diff) | |
parent | fix file perms and change AllowLightshareFunctions to AllowLightShareFunctions (diff) | |
download | opensim-SC_OLD-f0533132eb295cc6932b427fd93ccff0d3a8f439.zip opensim-SC_OLD-f0533132eb295cc6932b427fd93ccff0d3a8f439.tar.gz opensim-SC_OLD-f0533132eb295cc6932b427fd93ccff0d3a8f439.tar.bz2 opensim-SC_OLD-f0533132eb295cc6932b427fd93ccff0d3a8f439.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--[-rwxr-xr-x] | bin/config-include/osslEnable.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index 7c53ec0..5dfa71c 100755..100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | ; Allow the use of LightShare functions. | 21 | ; Allow the use of LightShare functions. |
22 | ; The setting enable_windlight = true must also be enabled in the [LightShare] section. | 22 | ; The setting enable_windlight = true must also be enabled in the [LightShare] section. |
23 | AllowLightshareFunctions = true | 23 | AllowLightShareFunctions = true |
24 | 24 | ||
25 | ; Threat level to allow. One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe. | 25 | ; Threat level to allow. One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe. |
26 | ; See http://opensimulator.org/wiki/Threat_level for more information on these levels. | 26 | ; See http://opensimulator.org/wiki/Threat_level for more information on these levels. |