summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/cmd_line.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-26 15:14:12 -0400
committerOz Linden <oz@lindenlab.com>2013-08-26 15:14:12 -0400
commit7ca10e516126e5fa9b076c04957b491495513907 (patch)
tree690323c7379c8151b1d7e251fa2878c10603fd61 /indra/newview/app_settings/cmd_line.xml
parent1e2a6ee3f440b7d076dc97f3a0628c90195f5386 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
merge changes for 3.6.4-release
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
-rwxr-xr-xindra/newview/app_settings/cmd_line.xml21
1 files changed, 18 insertions, 3 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index a6e93edc79..789a07fbe2 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>
@@ -96,6 +97,8 @@
0 - low, 1 - medium, 2 - high, 3 - ultra</string>
<key>count</key>
<integer>1</integer>
+ <key>map-to</key>
+ <string>RenderQualityPerformance</string>
</map>
<key>grid</key>
@@ -108,6 +111,16 @@
<string>CmdLineGridChoice</string>
</map>
+ <key>update-service</key>
+ <map>
+ <key>desc</key>
+ <string>Override the url base for the update query.</string>
+ <key>count</key>
+ <integer>1</integer>
+ <key>map-to</key>
+ <string>CmdLineUpdateService</string>
+ </map>
+
<key>help</key>
<map>
<key>desc</key>
@@ -378,7 +391,8 @@
<boolean>true</boolean>
<key>last_option</key>
<boolean>true</boolean>
- <!-- Special case. Not mapped to a setting. -->
+ <key>map-to</key>
+ <string>CmdLineLoginLocation</string>
</map>
<key>url</key>
@@ -389,7 +403,8 @@
<integer>1</integer>
<key>last_option</key>
<boolean>true</boolean>
- <!-- Special case. Not mapped to a setting. -->
+ <key>map-to</key>
+ <string>CmdLineLoginLocation</string>
</map>
<key>usersessionsettings</key>