diff options
Diffstat (limited to 'indra/newview/skins')
5 files changed, 107 insertions, 101 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 9baa9a0e02..53060b0326 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml @@ -3,82 +3,82 @@ legacy_header_height="18" height="490" layout="topleft" - name="Socks5 Advanced Settings Floater" + name="Proxy Settings Floater" help_topic="hardware_settings_floater" title="Socks5 proxy advanced settings" width="385"> - <check_box - control_name="BrowserProxyEnabled" - top="30" - enabled="true" - follows="left|top" - height="14" - initial_value="false" - commit_callback.function="Proxy.Change" - label="Use HTTP Proxy for Web pages" - left_delta="10" - mouse_opaque="true" - name="web_proxy_enabled" - radio_style="false" - width="400" - top_pad="5" /> - <check_box - control_name="Socks5ProxyEnabled" - height="16" - label="Use Socks 5 Proxy for UDP traffic" - layout="topleft" - left_delta="0" - name="socks_proxy_enabled" - top_pad="5" - width="256" - commit_callback.function="Proxy.Change" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="Proxy location" - top_delta="30" - width="300"> - Other Http traffic proxy: - </text> - <radio_group - control_name="Socks5HttpProxyType" - height="60" - layout="topleft" - name="other_http_proxy_selection" - top_pad="10" - width="120" - border="1" - left_delta="10" - commit_callback.function="Proxy.Change" > - <radio_item - height="16" - label="Do not proxy" - layout="topleft" - value="None" - width="120" - tool_tip="Non web Http traffic should 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 will be sent to 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 to the configured Web proxy." /> - </radio_group> - <text + <check_box + control_name="BrowserProxyEnabled" + top="30" + enabled="true" + follows="left|top" + height="14" + initial_value="false" + commit_callback.function="Proxy.Change" + label="Use HTTP Proxy for Web pages" + left_delta="10" + mouse_opaque="true" + name="web_proxy_enabled" + radio_style="false" + width="400" + top_pad="5" /> + <check_box + control_name="Socks5ProxyEnabled" + height="16" + label="Use Socks 5 Proxy for UDP traffic" + layout="topleft" + left_delta="0" + name="socks_proxy_enabled" + top_pad="5" + width="256" + commit_callback.function="Proxy.Change" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="Proxy location" + top_delta="30" + width="300"> + Other Http traffic proxy: + </text> + <radio_group + control_name="Socks5HttpProxyType" + height="60" + layout="topleft" + name="other_http_proxy_selection" + top_pad="10" + width="120" + border="1" + left_delta="10" + commit_callback.function="Proxy.Change" > + <radio_item + height="16" + label="Do not proxy" + layout="topleft" + value="None" + width="120" + tool_tip="Non web Http traffic should 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 will be sent to 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 to the configured Web proxy." /> + </radio_group> + <text type="string" length="1" follows="left|top" @@ -93,7 +93,7 @@ <line_editor control_name="BrowserProxyAddress" enabled_control="BrowserProxyEnabled" - follows="left|top" + follows="left|top" font="SansSerif" height="23" layout="topleft" @@ -118,7 +118,7 @@ min_val="10" name="web_proxy_port" top_delta="0" - tool_tip="The port of the HTTP proxy you would like to use." + tool_tip="The port of the HTTP proxy you would like to use." width="145" /> <text type="string" @@ -162,18 +162,18 @@ name="socks_proxy_port" top_delta="0" width="145" - tool_tip="The port of the SOCKS 5 proxy you would like to use." - commit_callback.function="Pref.SocksProxy" /> + tool_tip="The port of the SOCKS 5 proxy you would like to use." + commit_callback.function="Proxy.Change" /> <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="16" - name="Proxy location" - top_delta="35" - width="300"> + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="16" + name="Proxy location" + top_delta="35" + width="300"> Authentication: </text> <radio_group @@ -186,13 +186,13 @@ width="120" border="1" commit_callback.function="Proxy.Change" > - <radio_item + <radio_item height="16" label="No Authentication" layout="topleft" name="Socks5NoAuth" value="None" - tool_tip="Socks5 proxy requires no authentication."/> + tool_tip="Socks5 proxy requires no authentication." width="120" /> <radio_item height="16" @@ -200,7 +200,7 @@ layout="topleft" name="Socks5UserPass" value="UserPass" - tool_tip="Socks5 proxy requires username/password authentication."/> + tool_tip="Socks5 proxy requires username/password authentication." width="120" /> </radio_group> <text @@ -215,7 +215,6 @@ Username: </text> <line_editor - control_name="Socks5Username" follows="left|top" font="SansSerif" height="23" @@ -238,7 +237,6 @@ Password: </text> <line_editor - control_name="Socks5Password" follows="left|top" font="SansSerif" height="23" @@ -248,6 +246,7 @@ tool_tip="The password used to authenticate with your SOCKS 5 server" top_pad="4" width="200" + is_password="true" commit_callback.function="Proxy.Change" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 06a9baf8c8..7bf742d949 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7164,7 +7164,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_NOT_PERMITTED" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7174,7 +7175,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_CONNECT_ERROR" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7184,7 +7186,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_NOT_ACCEPTABLE" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system + The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7194,7 +7197,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_AUTH_FAIL" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid + The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7204,7 +7208,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_UDP_FWD_NOT_GRANTED" type="alertmodal"> - The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request + The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7214,7 +7219,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="SOCKS_HOST_CONNECT_FAILED" type="alertmodal"> - Could not connect to Socks5 proxy server "[HOST]:[PORT]" + Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]" + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -7224,7 +7230,8 @@ Click and drag anywhere on the world to rotate your view icon="alertmodal.tga" name="ChangeSocks5Settings" type="alert"> - Socks 5 proxy settings take effect after you restart [APP_NAME]. + SOCKS 5 proxy settings take effect after you restart [APP_NAME]. + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index bbeb592e96..beea53437a 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -52,7 +52,7 @@ multi_select="true" name="list_attachments" top="0" - width="311"> + width="311" /> </accordion_tab> <accordion_tab layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 30be5bc853..47236c1a48 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -139,7 +139,7 @@ height="16" label="Add datestamp to log file name." layout="topleft" - left_detla="5" + left_delta="5" name="logfile_name_datestamp" top_pad="10" width="350"/> 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 d306e46d5e..b0281b11fd 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -79,7 +79,7 @@ <spinner control_name="ConnectionPort" enabled_control="ConnectionPortEnabled" - decimal_digits="0" + decimal_digits="0" follows="left|top" height="23" increment="1" |