diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/llxmlrpctransaction.cpp | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llxmlrpctransaction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp index 058946e..675ba42 100644 --- a/linden/indra/newview/llxmlrpctransaction.cpp +++ b/linden/indra/newview/llxmlrpctransaction.cpp | |||
| @@ -226,10 +226,10 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip) | |||
| 226 | mCurlRequest = new LLCurlEasyRequest(); | 226 | mCurlRequest = new LLCurlEasyRequest(); |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | if (gSavedSettings.getBOOL("BrowserProxyEnabled")) | 229 | if (gSavedSettings.getBOOL("XMLRPCProxyEnabled")) |
| 230 | { | 230 | { |
| 231 | mProxyAddress = gSavedSettings.getString("BrowserProxyAddress"); | 231 | mProxyAddress = gSavedSettings.getString("XMLRPCProxyAddress"); |
| 232 | S32 port = gSavedSettings.getS32 ( "BrowserProxyPort" ); | 232 | S32 port = gSavedSettings.getS32 ( "XMLRPCProxyPort" ); |
| 233 | 233 | ||
| 234 | // tell curl about the settings | 234 | // tell curl about the settings |
| 235 | mCurlRequest->setoptString(CURLOPT_PROXY, mProxyAddress); | 235 | mCurlRequest->setoptString(CURLOPT_PROXY, mProxyAddress); |