diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/app_settings/cmd_line.xml | |
parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
-rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index ba3b6a42a4..1b8393330d 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -118,6 +118,8 @@ <map> <key>desc</key> <string>Log metrics for benchmarking</string> + <key>count</key> + <integer>1</integer> <key>map-to</key> <string>LogMetrics</string> </map> @@ -361,8 +363,7 @@ <map> <key>count</key> <integer>1</integer> - <key>map-to</key> - <string>VersionChannelName</string> + <!-- Special case. Not mapped to a setting. --> </map> <key>loginpage</key> |