From d79eedcfc3bbd0c72505bcf9bec98532a6fd5feb Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 18 Aug 2011 16:07:33 -0400
Subject: LLProxy: Renamed a setting to better describe what it controls.
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llstartup.cpp | 9 +++++----
indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d7536bea7a..7a617bb468 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -809,7 +809,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>Socks5HttpProxyType</key>
+ <key>HttpProxyType</key>
<map>
<key>Comment</key>
<string>Proxy type to use for HTTP operations</string>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 3fa51c51f5..e053c4b07a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2794,7 +2794,7 @@ void LLStartUp::setStartSLURL(const LLSLURL& slurl)
bool LLStartUp::startLLProxy()
{
bool proxy_ok = true;
- std::string httpProxyType = gSavedSettings.getString("Socks5HttpProxyType");
+ std::string httpProxyType = gSavedSettings.getString("HttpProxyType");
// Set up SOCKS proxy (if needed)
if (gSavedSettings.getBOOL("Socks5ProxyEnabled"))
@@ -2822,6 +2822,8 @@ bool LLStartUp::startLLProxy()
}
else
{
+ LL_WARNS("Proxy") << "Invalid SOCKS 5 authentication type."<< LL_ENDL;
+
// Unknown or missing setting.
gSavedSettings.setString("Socks5AuthType", "None");
@@ -2834,7 +2836,6 @@ bool LLStartUp::startLLProxy()
if (proxy_ok)
{
-
// Start the proxy and check for errors
// If status != SOCKS_OK, stopSOCKSProxy() will already have been called when startSOCKSProxy() returns.
LLHost socks_host;
@@ -2933,10 +2934,10 @@ bool LLStartUp::startLLProxy()
}
else
{
- LL_WARNS("Proxy") << "Invalid HTTP proxy configuration."<< LL_ENDL;
+ LL_WARNS("Proxy") << "Invalid other HTTP proxy configuration."<< LL_ENDL;
// Set the missing or wrong configuration back to something valid.
- gSavedSettings.setString("Socks5HttpProxyType", "None");
+ gSavedSettings.setString("HttpProxyType", "None");
LLProxy::getInstance()->disableHTTPProxy();
// Leave proxy_ok alone, since this isn't necessarily fatal.
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 fb5f85bf58..35cd118130 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -214,7 +214,7 @@
Other HTTP traffic proxy:
</text>
<radio_group
- control_name="Socks5HttpProxyType"
+ control_name="HttpProxyType"
height="60"
layout="topleft"
top_pad="9"
--
cgit v1.2.3