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/llcommon/llmd5.cpp | |
| parent | 7314ac3a37d624e6a750fc12df64d08b584ad593 (diff) | |
| parent | d32c1c28b4e2add4e51361d13356b6638c6f0817 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llcommon/llmd5.cpp')
| -rw-r--r-- | indra/llcommon/llmd5.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp index 75fde8e5ba..1409c55d1c 100644 --- a/indra/llcommon/llmd5.cpp +++ b/indra/llcommon/llmd5.cpp @@ -175,7 +175,7 @@ void LLMD5::update(std::istream& stream){ while (stream.good()){ stream.read( (char*)buffer, BLOCK_LEN); /* Flawfinder: ignore */ // note that return value of read is unusable. - len=stream.gcount(); + len=(int)stream.gcount(); update(buffer, len); } |