diff options
author | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
commit | c06d46b56788cccc778682cbd7cc37cbbca7b7cc (patch) | |
tree | 72f4da2ec09b31aae338b866f69dd4ea34968fb1 /indra/newview/app_settings | |
parent | 6711e6584aa0aa5f17f76a557524725857fbf2ba (diff) | |
parent | da0b5fe998434a935027b5e7cca2b70b895f0673 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 15434f2b8f..c02f89dee5 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -45,35 +45,13 @@ <key>grid</key> <map> <key>desc</key> - <string>Specify the name of the grid, local, or an IP address to connect to.</string> + <string>Specify the name of the grid to connect to.</string> <key>count</key> <integer>1</integer> <key>map-to</key> <string>CmdLineGridChoice</string> </map> - <key>loginuri</key> - <map> - <key>desc</key> - <string>login server and CGI script to use</string> - <key>count</key> - <integer>1</integer> - <key>compose</key> - <boolean>true</boolean> - <key>map-to</key> - <string>CmdLineLoginURI</string> - </map> - - <key>helperuri</key> - <map> - <key>desc</key> - <string>helper web CGI prefix to use</string> - <key>count</key> - <integer>1</integer> - <key>map-to</key> - <string>CmdLineHelperURI</string> - </map> - <key>debugviews</key> <map> <key>map-to</key> @@ -377,16 +355,6 @@ <!-- Special case. Not mapped to a setting. --> </map> - <key>loginpage</key> - <map> - <key>desc</key> - <string>Login authentication page to use.</string> - <key>count</key> - <integer>1</integer> - <key>map-to</key> - <string>LoginPage</string> - </map> - <key>qa</key> <map> <key>desc</key> |