diff options
| author | McCabe Maxsted | 2011-04-12 18:52:06 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-12 18:52:42 -0700 |
| commit | 976433ef4fdf81f44b2ec82344ff4fe2968eae08 (patch) | |
| tree | 4c54bb371129a77ea1695f0458cf2e71852e8c21 /linden/indra/newview/skins/default/xui/en-us | |
| parent | Tidied up the label names for socks 5 (diff) | |
| download | meta-impy-976433ef4fdf81f44b2ec82344ff4fe2968eae08.zip meta-impy-976433ef4fdf81f44b2ec82344ff4fe2968eae08.tar.gz meta-impy-976433ef4fdf81f44b2ec82344ff4fe2968eae08.tar.bz2 meta-impy-976433ef4fdf81f44b2ec82344ff4fe2968eae08.tar.xz | |
Make sure users can't enable both SOCKS 5 proxies and XMLRPC proxies at the same time (also fixes a SOCKS 5 preference not getting disabled). These prefs are extra-confusing right now, but will get sorted out in a bit
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml index 05bd995..76683cd 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | |||
| @@ -155,7 +155,7 @@ | |||
| 155 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 155 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
| 156 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" | 156 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" |
| 157 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 157 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" |
| 158 | height="10" left="35" mouse_opaque="false" name="socks5_auth_label" | 158 | height="10" left="35" mouse_opaque="false" name="http_proxy_label" |
| 159 | v_pad="0" width="128"> | 159 | v_pad="0" width="128"> |
| 160 | HTTP proxy: | 160 | HTTP proxy: |
| 161 | </text> | 161 | </text> |