livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LLProxy: Renamed a setting to better describe what it controls.

master
Logan Dethrow 2011-08-18 16:07:33 -04:00
parent 797b4df42a
commit d79eedcfc3
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -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>

9
indra/newview/llstartup.cpp
View File

@ -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.

2
indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
View File

@ -214,7 +214,7 @@
Other HTTP traffic proxy:
</text>
<radio_group
control_name="Socks5HttpProxyType"
control_name="HttpProxyType"
height="60"
layout="topleft"
top_pad="9"