diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-15 16:27:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-15 16:27:22 -0400 |
| commit | 2192a024ac8cdada18785f8627970d4908cc1730 (patch) | |
| tree | ccc1d84d72df56f501393ec150df770b2f0e1492 /indra/newview/app_settings | |
| parent | c18c1f2defa8109f07a5cd758dce2f6f9333c333 (diff) | |
| parent | 3e6ce2dbad485b1df10414dcb2ee0ee935da2750 (diff) | |
merge changes for CHOP-963
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/cmd_line.xml | 10 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 7ab7787d77..f60fc3afb2 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -108,6 +108,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> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9b9984367b..044a243e2a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1760,6 +1760,17 @@ <key>Value</key> <string /> </map> + <key>CmdLineUpdateService</key> + <map> + <key>Comment</key> + <string>Override the url base for the update query.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>CmdLineHelperURI</key> <map> <key>Comment</key> |