diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
commit | 0d596aa4de2f583862274350ce6287c0ed8c2bec (patch) | |
tree | 90a6ca5b29d5c99b585233d059e16dccc23a2e19 /indra/llcorehttp/_httplibcurl.cpp | |
parent | 70aa89f708254c47766f4629e9131ea492829129 (diff) | |
parent | 85b431d5137886927efef35ca558bc8a998a5212 (diff) |
Automated merge with file:///Users/nat/linden/viewer-gridselect
Diffstat (limited to 'indra/llcorehttp/_httplibcurl.cpp')
-rw-r--r-- | indra/llcorehttp/_httplibcurl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index abd304f6a5..975ce8a4d5 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -355,7 +355,8 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode } if (op->mStatus) { - int http_status(HTTP_OK); + // note: CURLINFO_RESPONSE_CODE requires a long - https://curl.haxx.se/libcurl/c/CURLINFO_RESPONSE_CODE.html + long http_status(HTTP_OK); if (handle) { |