diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-31 15:42:02 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-31 15:42:02 -0700 |
| commit | 83f5d0c61667ae7682893adbb8939f77b28c2201 (patch) | |
| tree | 081ac47802bf782a8dcd55d7c2fd100ee3f03b89 /indra/newview/app_settings/cmd_line.xml | |
| parent | 7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
Merge in viewer-development
Diffstat (limited to 'indra/newview/app_settings/cmd_line.xml')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index be79f91919..711191128b 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -101,7 +101,7 @@ <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> @@ -117,16 +117,6 @@ <string>h</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>ignorepixeldepth</key> <map> <key>desc</key> @@ -163,7 +153,7 @@ <key>map-to</key> <string>UserLogFile</string> </map> - + <key>login</key> <map> <key>desc</key> @@ -174,28 +164,6 @@ <string>UserLoginInfo</string> </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>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>logmetrics</key> <map> <key>desc</key> @@ -226,7 +194,7 @@ <map> <key>map-to</key> <string>NoAudio</string> - </map> + </map> <key>noinvlib</key> <map> @@ -242,7 +210,7 @@ <string>User will not get any notifications. NOTE: All notifications that occur will get added to ignore file for future runs.</string> <key>map-to</key> <string>IgnoreAllNotifications</string> - </map> + </map> <key>nopreload</key> <map> @@ -321,7 +289,7 @@ <key>map-to</key> <string>QuitAfterSeconds</string> </map> - + <key>replaysession</key> <map> <key>desc</key> @@ -335,7 +303,7 @@ <key>map-to</key> <string>RotateRight</string> </map> - + <key>safe</key> <map> <key>desc</key> |