diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-02 16:33:40 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-02 16:33:40 -0400 |
| commit | d8565b05a5ccc9df8522db1d0fb32c320fa975b9 (patch) | |
| tree | be67769325f110ab8ac898ad97979e8f39b4f68d /indra/newview/app_settings | |
| parent | 09d8d17382c72b7741fde1334e832f39d773299f (diff) | |
CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/cmd_line.xml | 3 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 71a052057c..74117dbd85 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -22,7 +22,8 @@ <map> <key>count</key> <integer>1</integer> - <!-- Special case. Not mapped to a setting. --> + <key>map-to</key> + <string>CmdLineChannel</string> </map> <key>console</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8a50ca146b..6f50a72016 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1749,6 +1749,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>CmdLineChannel</key> + <map> + <key>Comment</key> + <string>Command line specified channel name</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>CmdLineDisableVoice</key> <map> <key>Comment</key> |