3 files changed, 19 insertions, 17 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d2582d524d..57e197a263 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -136,6 +136,7 @@
 #include "lltoolmgr.h"
 #include "llassetstorage.h"
 #include "llpolymesh.h"
+#include "llproxy.h"
 #include "llaudioengine.h"
 #include "llstreamingaudio.h"
 #include "llviewermenu.h"
@@ -1869,6 +1870,8 @@ bool LLAppViewer::cleanup()
 		LLWeb::loadURLExternal( gLaunchFileOnQuit, false );
 		llinfos << "File launched." << llendflush;
 	}
+	llinfos << "Cleaning up LLProxy." << llendl;
+	LLProxy::cleanupClass();
 
 	LLMainLoopRepeater::instance().stop();
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 7f14e403b0..8b333f265c 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2766,17 +2766,17 @@ bool LLStartUp::handleSocksProxy()
 	// Determine the HTTP proxy type (if any)
 	if ((httpProxyType.compare("Web") == 0) && gSavedSettings.getBOOL("BrowserProxyEnabled"))
 	{
-		LLHost httpHost;
-		httpHost.setHostByName(gSavedSettings.getString("BrowserProxyAddress"));
-		httpHost.setPort(gSavedSettings.getS32("BrowserProxyPort"));
-		LLProxy::getInstance()->enableHTTPProxy(httpHost, LLPROXY_HTTP);
+		LLHost http_host;
+		http_host.setHostByName(gSavedSettings.getString("BrowserProxyAddress"));
+		http_host.setPort(gSavedSettings.getS32("BrowserProxyPort"));
+		LLProxy::getInstance()->enableHTTPProxy(http_host, LLPROXY_HTTP);
 	}
 	else if ((httpProxyType.compare("Socks") == 0) && gSavedSettings.getBOOL("Socks5ProxyEnabled"))
 	{
-		LLHost httpHost;
-		httpHost.setHostByName(gSavedSettings.getString("Socks5ProxyHost"));
-		httpHost.setPort(gSavedSettings.getU32("Socks5ProxyPort"));
-		LLProxy::getInstance()->enableHTTPProxy(httpHost, LLPROXY_SOCKS);
+		LLHost socks_host;
+		socks_host.setHostByName(gSavedSettings.getString("Socks5ProxyHost"));
+		socks_host.setPort(gSavedSettings.getU32("Socks5ProxyPort"));
+		LLProxy::getInstance()->enableHTTPProxy(socks_host, LLPROXY_SOCKS);
 	}
 	else
 	{
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 91e85c812c..020ee52c18 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -217,7 +217,6 @@
 	 control_name="Socks5HttpProxyType"
 	 height="60"
 	 layout="topleft"
-	 name="other_http_proxy_selection"
 	 top_pad="9"
 	 width="120"
 	 border="1"
@@ -232,20 +231,20 @@
 		 tool_tip="Non-web HTTP traffic will 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 traffic will be sent through 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 through the configured Web proxy." />
+		<radio_item
+		 height="16"
+		 label="Use SOCKS 5 Proxy"
+		 layout="topleft"
+		 value="Socks"
+		 width="120"
+		 enabled_control="Socks5ProxyEnabled"
+		 tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
 	</radio_group>
 	<button
 	 follows="left|top"