2 files changed, 18 insertions, 10 deletions

diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index a371962..3b866eb 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -218,6 +218,8 @@ void LLPanelNetwork::onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data)
         self->childSetEnabled("xmlrpc_proxy_editor", check->get());
         self->childSetEnabled("xmlrpc_proxy_port", check->get());
         self->childSetEnabled("xmlrpc_proxy_text_label", check->get());
+
+        self->childSetEnabled("socks5_proxy_enabled", !check->get());
 }
 
 // static
@@ -258,13 +260,13 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std
         // to avoid code duplication
 
         // Update all socks labels and controls except auth specific ones
-        self->childSetEnabled("socks5_proxy_port",  enabled);
-        self->childSetEnabled("socks5_proxy_host",  enabled);
-        self->childSetEnabled("socks5_host_label",  enabled);
-        self->childSetEnabled("socks5_proxy_label", enabled);
-        self->childSetEnabled("socks5_proxy_port",  enabled);
-        self->childSetEnabled("socks5_auth_label",  enabled);
-        self->childSetEnabled("socks5_auth",        enabled);
+        self->childSetEnabled("socks5_proxy_port",      enabled);
+        self->childSetEnabled("socks5_proxy_host",      enabled);
+        self->childSetEnabled("socks5_host_label",      enabled);
+        self->childSetEnabled("socks5_proxy_label",     enabled);
+        self->childSetEnabled("socks5_proxy_port",      enabled);
+        self->childSetEnabled("socks5_auth_label",      enabled);
+        self->childSetEnabled("socks5_auth",            enabled);
 
         // disable the web option if the web proxy has not been configured
         // this is still not ideal as apply or ok is needed for this to be saved to the preferences
@@ -272,7 +274,7 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std
 
         self->childSetEnabled("Socks", enabled);
 
-        // Hide the auth specific lables if authtype is none or
+        // Hide the auth specific labels if authtype is none or
         // we are not enabled.
         if ((authtype.compare("None") == 0) || (enabled == false))
         {
@@ -283,7 +285,7 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std
         }
 
         // Only show the username and password boxes if we are enabled
-        // and authtype is username pasword.
+        // and authtype is username password.
         if ((authtype.compare("UserPass") == 0) && (enabled == true))
         {
                 self->childSetEnabled("socks5_username_label", true);
@@ -291,4 +293,10 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std
                 self->childSetEnabled("socks5_proxy_username", true);
                 self->childSetEnabled("socks5_proxy_password", true);
         }
+
+        // Disable the XMLRPC proxy if it's enabled and we enable SOCKS5
+        self->childSetEnabled("xmlrpc_proxy_enabled", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_editor", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_port", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_text_label", !enabled);
 }
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 @@
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom_delta="-20" drop_shadow_visible="true" enabled="true"
      follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-     height="10" left="35" mouse_opaque="false" name="socks5_auth_label"
+     height="10" left="35" mouse_opaque="false" name="http_proxy_label"
      v_pad="0" width="128">
     HTTP proxy:
   </text>