diff options
author | Kitto Flora | 2009-12-15 06:01:59 -0500 |
---|---|---|
committer | Kitto Flora | 2009-12-15 06:01:59 -0500 |
commit | 0020afaf67e404be9d5f304020bcbbb1dcd2e1f5 (patch) | |
tree | e22fcdf9c94bb2f616a44bd797e452bafb5c61d1 /bin | |
parent | Removed excessive call to UpdateMovementAnimations which prevented GroundSit;... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-0020afaf67e404be9d5f304020bcbbb1dcd2e1f5.zip opensim-SC-0020afaf67e404be9d5f304020bcbbb1dcd2e1f5.tar.gz opensim-SC-0020afaf67e404be9d5f304020bcbbb1dcd2e1f5.tar.bz2 opensim-SC-0020afaf67e404be9d5f304020bcbbb1dcd2e1f5.tar.xz |
Merge branch 'master' into tests
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 04cf8e8..af9632e 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -107,7 +107,15 @@ | |||
107 | ; Combine all contiguous regions into one large region | 107 | ; Combine all contiguous regions into one large region |
108 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true | 108 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true |
109 | ; Warning! Don't use this with regions that have existing content!, This will likely break them | 109 | ; Warning! Don't use this with regions that have existing content!, This will likely break them |
110 | CombineContiguousRegions=false | 110 | CombineContiguousRegions = false |
111 | |||
112 | ; If you have only one region in an instance, or to avoid the many bugs | ||
113 | ; that you can trigger in modules by restarting a region, set this to | ||
114 | ; true to make the entire instance exit instead of restarting the region. | ||
115 | ; This is meant to be used on systems where some external system like | ||
116 | ; Monit will restart any instance that exits, thereby making the shutdown | ||
117 | ; into a restart. | ||
118 | ;InworldRestartShutsDown = false | ||
111 | 119 | ||
112 | ; ## | 120 | ; ## |
113 | ; ## STORAGE | 121 | ; ## STORAGE |