diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-13 20:00:55 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-13 20:00:55 +0000 |
| commit | d60c966bcf981416790a286fbab0598192914910 (patch) | |
| tree | 7a2c8f6e5df9d57276f0b8d64ded68f0ae58eddc /indra/lib | |
| parent | d2e5b7ca858b3da99bb6380b3da315c5191935d0 (diff) | |
svn merge -r81066:82130 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
Pick up last minute changes to 1.19.0:
* Access/Ban UI string "translation" fixes from 1.19.0.5
* Support for setting more scoped channel during builds/packaging, for A/B testing
Diffstat (limited to 'indra/lib')
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index a73fc6c293..814e1c9f95 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -128,8 +128,11 @@ ARGUMENTS=[ value for this parameter.""", default=""), dict(name='channel', - description="""The channel to use for updates.""", + description="""The channel to use for updates, packaging, settings name, etc.""", default=get_channel), + dict(name='login_channel', + description="""The channel to use for login handshake/updates only.""", + default=None), dict(name='installer_name', description=""" The name of the file that the installer should be packaged up into. Only used on Linux at the moment.""", |