diff options
| author | Richard Linden <none@none> | 2012-02-01 16:51:06 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-01 16:51:06 -0800 |
| commit | 174aa75799e608f951d3463f953c91968b868ef6 (patch) | |
| tree | 9edca14e09b986ec12c44cd2510a5099f0eda3ce /indra/llmessage/llcurl.cpp | |
| parent | 7314ac3a37d624e6a750fc12df64d08b584ad593 (diff) | |
| parent | d32c1c28b4e2add4e51361d13356b6638c6f0817 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index e17380fdf5..344463f036 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -428,9 +428,9 @@ size_t curlReadCallback(char* data, size_t size, size_t nmemb, void* user_data) LLCurl::Easy* easy = (LLCurl::Easy*)user_data; S32 n = size * nmemb; - S32 startpos = easy->getInput().tellg(); + S32 startpos = (S32)easy->getInput().tellg(); easy->getInput().seekg(0, std::ios::end); - S32 endpos = easy->getInput().tellg(); + S32 endpos = (S32)easy->getInput().tellg(); easy->getInput().seekg(startpos, std::ios::beg); S32 maxn = endpos - startpos; n = llmin(n, maxn); |