diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
| commit | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch) | |
| tree | 2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/llmessage/llmime.cpp | |
| parent | 9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff) | |
| parent | 1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
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. |