diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-05-19 16:21:58 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-05-19 16:21:58 -0700 |
| commit | 4158e69141cd59c9b1c669fa0eea8c3d95b74132 (patch) | |
| tree | 0f417b7e3ca2789957e00157c1303255e3b879d0 /indra/newview | |
| parent | c308c1cf5987fcca5614d472d3098d5075cbd678 (diff) | |
Fix for SL-12320 The Viewer functionality is broken with an in-viewer enabled proxy - there isn't an obvious way to set proxy information for CEF alone and QA asserts that the system setting is used so we are removing the proxy UI from the preferences floater. I purposely left everything else in place (config floater, media plugin messages etc.) so we can consider adding CEF specific support one day.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 29 |
1 files changed, 14 insertions, 15 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 89a5a5ca6f..27beb3937c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -229,22 +229,21 @@ left="30" name="Proxy Settings:" 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:" + 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> |