diff options
| author | Callum Prentice <callum@mbp.local> | 2021-08-10 11:08:45 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-08-10 11:08:45 -0700 |
| commit | 3a3296f371508c4a31a37053242ee69a574f22f0 (patch) | |
| tree | 83ee018b210d05258fd0ab6a491def74aa29cdfd /indra/newview/skins/default/xui/en | |
| parent | 0c3b78105d49185f37eff60d9c167d17e6072fc8 (diff) | |
| parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) | |
Merge branch 'master' into DRTVWR-519 after Viewer release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 6732f4ff1c..dff6f6e600 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -148,20 +148,6 @@ </radio_group> <check_box - top_delta="2" - enabled="true" - follows="left|top" - height="18" - initial_value="true" - control_name="BrowserPluginsEnabled" - label="Enable plugins" - left_delta="20" - mouse_opaque="true" - name="browser_plugins_enabled" - radio_style="false" - width="400" - top_pad="5"/> - <check_box top_delta="4" enabled="true" follows="left|top" @@ -241,24 +227,23 @@ height="10" layout="topleft" left="30" - name="Proxy Settings:" + name="Proxy Settings 1" + mouse_opaque="false" + top_pad="10" + width="300"> + Proxy Settings: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + name="Proxy Settings 2" mouse_opaque="false" top_pad="5" width="300"> - Proxy Settings: + Your system's existing proxy settings will be used </text> - <button - label="Adjust proxy settings" - follows="left|top" - height="23" - width="140" - label_selected="Browse" - layout="topleft" - left_delta="50" - name="set_proxy" - top_pad="5" - > - <button.commit_callback - function="Pref.Proxy" /> - </button> </panel> |