summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_proxy.xml17
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 91e85c812c..020ee52c18 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -217,7 +217,6 @@
control_name="Socks5HttpProxyType"
height="60"
layout="topleft"
- name="other_http_proxy_selection"
top_pad="9"
width="120"
border="1"
@@ -232,20 +231,20 @@
tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/>
<radio_item
height="16"
- label="Use SOCKS 5 Proxy"
- layout="topleft"
- value="Socks"
- width="120"
- enabled_control="Socks5ProxyEnabled"
- tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
- <radio_item
- height="16"
label="Use HTTP Proxy"
layout="topleft"
value="Web"
width="120"
enabled_control="BrowserProxyEnabled"
tool_tip="Non-web HTTP will be sent through the configured Web proxy." />
+ <radio_item
+ height="16"
+ label="Use SOCKS 5 Proxy"
+ layout="topleft"
+ value="Socks"
+ width="120"
+ enabled_control="Socks5ProxyEnabled"
+ tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
</radio_group>
<button
follows="left|top"