diff options
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 456f898bfa..d65928e385 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2095,7 +2095,7 @@ void LLFloaterPreferenceProxy::onChangeSocksSettings() } // Check for invalid states for the other HTTP proxy radio - LLRadioGroup* otherHttpProxy = getChild<LLRadioGroup>("HttpProxyType"); + LLRadioGroup* otherHttpProxy = getChild<LLRadioGroup>("other_http_proxy_type"); if ((otherHttpProxy->getSelectedValue().asString() == "Socks" && getChild<LLCheckBoxCtrl>("socks_proxy_enabled")->get() == FALSE )||( otherHttpProxy->getSelectedValue().asString() == "Web" && 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 35cd118130..449731ab89 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml @@ -138,7 +138,6 @@ name="socks5_auth_type" top_pad="10" width="120" - border="1" commit_callback.function="Proxy.Change" > <radio_item height="16" @@ -215,17 +214,18 @@ </text> <radio_group control_name="HttpProxyType" + name="other_http_proxy_type" height="60" layout="topleft" top_pad="9" width="120" - border="1" left_delta="15" commit_callback.function="Proxy.Change" > <radio_item height="16" label="Do not proxy" layout="topleft" + name="OtherNoProxy" value="None" width="120" tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/> @@ -233,6 +233,7 @@ height="16" label="Use HTTP Proxy" layout="topleft" + name="OtherHTTPProxy" value="Web" width="120" enabled_control="BrowserProxyEnabled" @@ -241,6 +242,7 @@ height="16" label="Use SOCKS 5 Proxy" layout="topleft" + name="OtherSocksProxy" value="Socks" width="120" enabled_control="Socks5ProxyEnabled" @@ -268,6 +270,4 @@ top_delta="0" width="90" commit_callback.function="Proxy.Cancel" /> - - </floater> |