diff options
| author | McCabe Maxsted | 2011-03-22 02:00:36 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-22 02:00:36 -0700 |
| commit | 831ca11758eba659713c507bcb6b8b12a1234ffd (patch) | |
| tree | 3ea77441273cf59ad11313e576e85d45528cc6e2 /linden/indra/newview/llxmlrpctransaction.cpp | |
| parent | Support username logins on Linden grids. Seems to cover most edge cases with ... (diff) | |
| parent | Don't report crashes if the grid where the crash happened is different from t... (diff) | |
| download | meta-impy-831ca11758eba659713c507bcb6b8b12a1234ffd.zip meta-impy-831ca11758eba659713c507bcb6b8b12a1234ffd.tar.gz meta-impy-831ca11758eba659713c507bcb6b8b12a1234ffd.tar.bz2 meta-impy-831ca11758eba659713c507bcb6b8b12a1234ffd.tar.xz | |
Merge remote-tracking branch 'armin/exp' into exp
Diffstat (limited to 'linden/indra/newview/llxmlrpctransaction.cpp')
| -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); |