diff options
| author | McCabe Maxsted | 2010-11-09 19:00:50 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-09 19:00:50 -0700 |
| commit | 52c9b5122b80723de2329afd3f2574eb3143d8c9 (patch) | |
| tree | c734ec7ff3cb0f3880a4e20d0036622a2e580384 /linden/indra/lib | |
| parent | fix: add missing AllowEditingOfTrees setting (diff) | |
| parent | Install unstripped binary in packaged when --type=Debug (diff) | |
| download | meta-impy-52c9b5122b80723de2329afd3f2574eb3143d8c9.zip meta-impy-52c9b5122b80723de2329afd3f2574eb3143d8c9.tar.gz meta-impy-52c9b5122b80723de2329afd3f2574eb3143d8c9.tar.bz2 meta-impy-52c9b5122b80723de2329afd3f2574eb3143d8c9.tar.xz | |
Merge remote branch 'aleric/weekly' into weekly
Diffstat (limited to 'linden/indra/lib')
| -rw-r--r-- | linden/indra/lib/python/indra/util/llmanifest.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index 3444a15..fc777b2 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py | |||
| @@ -121,6 +121,9 @@ ARGUMENTS=[ | |||
| 121 | default=""), | 121 | default=""), |
| 122 | dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE), | 122 | dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE), |
| 123 | dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), | 123 | dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), |
| 124 | dict(name='buildtype', | ||
| 125 | description='Set to DEBUG if this is a debug build.', | ||
| 126 | default="RELEASE"), | ||
| 124 | dict(name='channel', | 127 | dict(name='channel', |
| 125 | description="""The channel to use for updates, packaging, settings name, etc.""", | 128 | description="""The channel to use for updates, packaging, settings name, etc.""", |
| 126 | default=get_channel), | 129 | default=get_channel), |