diff options
| author | Melanie | 2013-01-02 11:52:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-02 11:52:37 +0000 |
| commit | 7943c8d11cbcac3ab16fb347d0c4116adc6437a5 (patch) | |
| tree | a8f099569905001bdedf144a77fd7b9191aa6427 /bin/OpenSim.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add parameter to have Bullet output performance statistics (diff) | |
| download | opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.zip opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.gz opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.bz2 opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f3e4f6c..cc750a9 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -787,8 +787,9 @@ | |||
| 787 | ;; Allow the use of os* functions (some are dangerous) | 787 | ;; Allow the use of os* functions (some are dangerous) |
| 788 | ; AllowOSFunctions = false | 788 | ; AllowOSFunctions = false |
| 789 | 789 | ||
| 790 | ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true | 790 | ;# {AllowLightShareFunctions} {Enabled:false [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} false |
| 791 | ; Allow the user of LightShare functions | 791 | ; Allow the use of LightShare functions. |
| 792 | ; The setting enable_windlight = true must also be enabled in the [LightShare] section. | ||
| 792 | ; AllowLightShareFunctions = false | 793 | ; AllowLightShareFunctions = false |
| 793 | 794 | ||
| 794 | ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow | 795 | ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow |