summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2021-10-05 14:37:48 -0700
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-10-07 20:16:54 +0300
commit454c7f4543688126b2fa5c0560710f5a1733702e (patch)
tree99175a8593c06d81482b7d49756c2282f4ac1b17 /indra/newview/skins/default
parent9563cf0556af7884b23272a8d814fef1678a8a19 (diff)
Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxy
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml32
1 files changed, 17 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 dff6f6e600..5e41ba4ae1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -227,23 +227,25 @@
height="10"
layout="topleft"
left="30"
- 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"
+ name="Proxy Settings:"
mouse_opaque="false"
top_pad="5"
width="300">
- Your system's existing proxy settings will be used
+ Proxy Settings:
</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>
+