From 73afcff635f3d25432167ca43ab0b82aadd6c687 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Thu, 30 Jun 2011 18:31:53 -0400 Subject: STORM-1112 Rearranged proxy preferences panels. --- .../default/xui/en/floater_preferences_proxy.xml | 175 +++++++++++---------- 1 file changed, 88 insertions(+), 87 deletions(-) (limited to 'indra') 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 53060b0326..91e85c812c 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml @@ -1,92 +1,36 @@ + help_topic="proxy_settings_floater" + title="Proxy Settings" + width="500"> - - - Other Http traffic proxy: - - - - - - HTTP Proxy: @@ -120,15 +64,25 @@ top_delta="0" tool_tip="The port of the HTTP proxy you would like to use." width="145" /> + SOCKS 5 Proxy: @@ -170,11 +124,11 @@ follows="left|top" height="10" layout="topleft" - left="16" + left="40" name="Proxy location" - top_delta="35" + top_pad="15" width="300"> - Authentication: + SOCKS Authentication: + width="200"> Username: + + Password: + - - Password: - + + Other HTTP traffic proxy: + + + + + +