diff options
author | Justin Clark-Casey (justincc) | 2011-06-30 22:36:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-30 22:36:41 +0100 |
commit | a9b7487fcb657bf50d69a522fb9dfb37d547f347 (patch) | |
tree | 348e89f9f1f6f7e8e2c53ccfdfb58102c0e3789b /bin | |
parent | minor: adjust some indentation and spacing in OpenSim.ini.example for consist... (diff) | |
download | opensim-SC_OLD-a9b7487fcb657bf50d69a522fb9dfb37d547f347.zip opensim-SC_OLD-a9b7487fcb657bf50d69a522fb9dfb37d547f347.tar.gz opensim-SC_OLD-a9b7487fcb657bf50d69a522fb9dfb37d547f347.tar.bz2 opensim-SC_OLD-a9b7487fcb657bf50d69a522fb9dfb37d547f347.tar.xz |
improve and tidy up some config file comments
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 11 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 23 |
2 files changed, 20 insertions, 14 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index df4e60b..a4f243d 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -78,20 +78,19 @@ | |||
78 | ; DrawPrimOnMapTile = true | 78 | ; DrawPrimOnMapTile = true |
79 | 79 | ||
80 | ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 | 80 | ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 |
81 | ;; Maximum size for non-physical prims | 81 | ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). |
82 | ; NonPhysicalPrimMax = 256 | 82 | ; NonPhysicalPrimMax = 256 |
83 | 83 | ||
84 | ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 | 84 | ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 |
85 | ;; Maximum size where a prim can be physical | 85 | ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. |
86 | ; PhysicalPrimMax = 10 | 86 | ; PhysicalPrimMax = 10 |
87 | 87 | ||
88 | ;; Prevent the creation, import and rez of prims that exceed the | 88 | ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum |
89 | ;; maximum size. | 89 | ;; This can be overriden in the region config file. |
90 | ; ClampPrimSize = false | 90 | ; ClampPrimSize = false |
91 | 91 | ||
92 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false | 92 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false |
93 | ;; Allow scripts to cross region boundaries. These are recompiled on the | 93 | ;; 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. |
94 | ;; new region. | ||
95 | ; AllowScriptCrossing = false | 94 | ; AllowScriptCrossing = false |
96 | 95 | ||
97 | ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false | 96 | ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 57db852..400d3df 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -14,10 +14,13 @@ | |||
14 | ; Place to create a PID file | 14 | ; Place to create a PID file |
15 | ; PIDFile = "/tmp/my.pid" | 15 | ; PIDFile = "/tmp/my.pid" |
16 | 16 | ||
17 | ; Console commands run at startup | ||
17 | startup_console_commands_file = "startup_commands.txt" | 18 | startup_console_commands_file = "startup_commands.txt" |
19 | |||
20 | ; Console commands run on shutdown | ||
18 | shutdown_console_commands_file = "shutdown_commands.txt" | 21 | shutdown_console_commands_file = "shutdown_commands.txt" |
19 | 22 | ||
20 | ; To run a script every few minutes, set the script filename here | 23 | ; Console commands run every 20 minutes |
21 | ; timer_Script = "filename" | 24 | ; timer_Script = "filename" |
22 | 25 | ||
23 | ; ## | 26 | ; ## |
@@ -70,12 +73,17 @@ | |||
70 | ; Use terrain texture for maptiles if true, use shaded green if false | 73 | ; Use terrain texture for maptiles if true, use shaded green if false |
71 | TextureOnMapTile = false | 74 | TextureOnMapTile = false |
72 | 75 | ||
73 | ; Maximum total size, and maximum size where a prim can be physical | 76 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). |
74 | NonPhysicalPrimMax = 256 | 77 | NonPhysicalPrimMax = 256 |
75 | PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!) | 78 | |
79 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. | ||
80 | PhysicalPrimMax = 10 | ||
81 | |||
82 | ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum | ||
83 | ; This can be overriden in the region config file. | ||
76 | ClampPrimSize = false | 84 | ClampPrimSize = false |
77 | 85 | ||
78 | ; Allow scripts to cross region boundaries. These are recompiled on the new region. | 86 | ; 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. |
79 | AllowScriptCrossing = false | 87 | AllowScriptCrossing = false |
80 | 88 | ||
81 | ; Allow compiled script binary code to cross region boundaries. | 89 | ; Allow compiled script binary code to cross region boundaries. |
@@ -94,7 +102,7 @@ | |||
94 | ; neighbors on each side for a total of 49 regions in view. Warning, unless | 102 | ; neighbors on each side for a total of 49 regions in view. Warning, unless |
95 | ; all the regions have the same drawdistance, you will end up with strange | 103 | ; all the regions have the same drawdistance, you will end up with strange |
96 | ; effects because the agents that get closed may be inconsistent. | 104 | ; effects because the agents that get closed may be inconsistent. |
97 | ; DefaultDrawDistance = 255.0 | 105 | DefaultDrawDistance = 255.0 |
98 | 106 | ||
99 | ; If you have only one region in an instance, or to avoid the many bugs | 107 | ; If you have only one region in an instance, or to avoid the many bugs |
100 | ; that you can trigger in modules by restarting a region, set this to | 108 | ; that you can trigger in modules by restarting a region, set this to |
@@ -102,7 +110,7 @@ | |||
102 | ; This is meant to be used on systems where some external system like | 110 | ; This is meant to be used on systems where some external system like |
103 | ; Monit will restart any instance that exits, thereby making the shutdown | 111 | ; Monit will restart any instance that exits, thereby making the shutdown |
104 | ; into a restart. | 112 | ; into a restart. |
105 | ;InworldRestartShutsDown = false | 113 | InworldRestartShutsDown = false |
106 | 114 | ||
107 | ; ## | 115 | ; ## |
108 | ; ## PRIM STORAGE | 116 | ; ## PRIM STORAGE |
@@ -227,7 +235,6 @@ | |||
227 | 235 | ||
228 | ; If enabled, enableFlySlow will change the primary fly state to | 236 | ; If enabled, enableFlySlow will change the primary fly state to |
229 | ; FLYSLOW, and the "always run" state will be the regular fly. | 237 | ; FLYSLOW, and the "always run" state will be the regular fly. |
230 | |||
231 | enableflyslow = false | 238 | enableflyslow = false |
232 | 239 | ||
233 | ; PreJump is an additional animation state, but it probably | 240 | ; PreJump is an additional animation state, but it probably |
@@ -236,7 +243,6 @@ | |||
236 | 243 | ||
237 | ; This is commented so it will come on automatically once it's | 244 | ; This is commented so it will come on automatically once it's |
238 | ; supported. | 245 | ; supported. |
239 | |||
240 | ; enableprejump = true | 246 | ; enableprejump = true |
241 | 247 | ||
242 | ; Simulator Stats URI | 248 | ; Simulator Stats URI |
@@ -265,6 +271,7 @@ | |||
265 | DelayBeforeAppearanceSave = 5 | 271 | DelayBeforeAppearanceSave = 5 |
266 | DelayBeforeAppearanceSend = 2 | 272 | DelayBeforeAppearanceSend = 2 |
267 | 273 | ||
274 | |||
268 | [SMTP] | 275 | [SMTP] |
269 | enabled=false | 276 | enabled=false |
270 | 277 | ||