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/llmime.cpp | |
| parent | 7314ac3a37d624e6a750fc12df64d08b584ad593 (diff) | |
| parent | d32c1c28b4e2add4e51361d13356b6638c6f0817 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llmessage/llmime.cpp')
| -rw-r--r-- | indra/llmessage/llmime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llmime.cpp b/indra/llmessage/llmime.cpp index 943a734927..9d9c4ebd68 100644 --- a/indra/llmessage/llmime.cpp +++ b/indra/llmessage/llmime.cpp @@ -388,7 +388,7 @@ bool LLMimeParser::Impl::parseHeaders( // not to read past limit when we get() the newline. S32 max_get = llmin((S32)LINE_BUFFER_LENGTH, limit - mScanCount - 1); istr.getline(mBuffer, max_get, '\r'); - mScanCount += istr.gcount(); + mScanCount += (S32)istr.gcount(); int c = istr.get(); if(EOF == c) { @@ -496,7 +496,7 @@ void LLMimeParser::Impl::scanPastSeparator( // past limit when we get() the newline. S32 max_get = llmin((S32)LINE_BUFFER_LENGTH, limit - mScanCount - 1); istr.getline(mBuffer, max_get, '\r'); - mScanCount += istr.gcount(); + mScanCount += (S32)istr.gcount(); if(istr.gcount() >= LINE_BUFFER_LENGTH - 1) { // that's way too long to be a separator, so ignore it. |