diff options
author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
---|---|---|
committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /bin/OpenSim.ini.example | |
parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r-- | bin/OpenSim.ini.example | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2fe4db7..bcfaf76 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -39,6 +39,9 @@ | |||
39 | ;# {save_crashes} {} {Save crashes to disk?} {true false} false | 39 | ;# {save_crashes} {} {Save crashes to disk?} {true false} false |
40 | ;; Set this to true if you want to log crashes to disk | 40 | ;; Set this to true if you want to log crashes to disk |
41 | ;; this can be useful when submitting bug reports. | 41 | ;; this can be useful when submitting bug reports. |
42 | ;; However, this will only log crashes within OpenSimulator that cause the entire program to exit | ||
43 | ;; It will not log crashes caused by virtual machine failures, which includes mono and ODE failures. | ||
44 | ;; You will need to capture these native stack traces by recording the session log itself. | ||
42 | ; save_crashes = false | 45 | ; save_crashes = false |
43 | 46 | ||
44 | ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes | 47 | ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes |
@@ -80,9 +83,11 @@ | |||
80 | ;; This can be overriden in the region config file. | 83 | ;; This can be overriden in the region config file. |
81 | ; ClampPrimSize = false | 84 | ; ClampPrimSize = false |
82 | 85 | ||
83 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false | 86 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true |
84 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded. | 87 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
85 | ; AllowScriptCrossing = false | 88 | ;; This only applies when crossing to a region running in a different simulator. |
89 | ;; For crossings where the regions are on the same simulator the script is always kept running. | ||
90 | ; AllowScriptCrossing = true | ||
86 | 91 | ||
87 | ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false | 92 | ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false |
88 | ;; Allow compiled script binary code to cross region boundaries. | 93 | ;; Allow compiled script binary code to cross region boundaries. |
@@ -711,6 +716,11 @@ | |||
711 | ; Enabled = true; | 716 | ; Enabled = true; |
712 | 717 | ||
713 | 718 | ||
719 | [NPC] | ||
720 | ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false | ||
721 | ; Enabled = false | ||
722 | |||
723 | |||
714 | [PrimLimitsModule] | 724 | [PrimLimitsModule] |
715 | ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false | 725 | ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false |
716 | ;; Enable parcel prim limits. Off by default to emulate pre-existing behavior. | 726 | ;; Enable parcel prim limits. Off by default to emulate pre-existing behavior. |