summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/cmd_line.xml
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-11-19 15:40:05 -0800
committerbrad kittenbrink <brad@lindenlab.com>2010-11-19 15:40:05 -0800
commitfd78866bcdf712aaefecfb74d7edaecb30c91b27 (patch)
tree235398d36401c68fc841389bb11984d94d36d7db /indra/newview/app_settings/cmd_line.xml
parent3337ef16cee97e26b45aa07518d34d031bdc75fa (diff)
parentb6edd74775e07ce392b0a1785cfc61338c890dad (diff)
Merged latest lindenlab/viewer-development with mani_linden/viewer-development
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
-rw-r--r--indra/newview/app_settings/cmd_line.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 0562cf5480..1b8393330d 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -363,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>