From 2e5ea4f5a7cfba6a7cf0de3c0295194b868fe369 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 24 Mar 2012 16:18:51 +0100
Subject: [PATCH] Fix proxy setting initialization

---
 indra/newview/llstartup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index b27e2bafd..1029b2709 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -4299,7 +4299,7 @@ bool LLStartUp::startLLProxy()
 			LL_WARNS("Proxy") << "Invalid other HTTP proxy configuration."<< LL_ENDL;
 
 			// Set the missing or wrong configuration back to something valid.
-			gSavedSettings.setString("HttpProxyType", "None");
+			gSavedSettings.setString("Socks5HttpProxyType", "None");
 			LLProxy::getInstance()->disableHTTPProxy();
 
 			// Leave proxy_ok alone, since this isn't necessarily fatal.