diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 16:19:18 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 16:19:18 -0400 |
commit | 542975b4c674c6e13d80f0ec4c18931e769f33b4 (patch) | |
tree | 6274ce57b4c0f0750daf3d4538a0dca9de650981 /indra/llcrashlogger/llcrashlogger.cpp | |
parent | 635a264e6f76f33a05694c069635653cd19de5d9 (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
merge
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 3461aa3e6c..d6dcde4b9f 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -250,7 +250,7 @@ void LLCrashLogger::gatherFiles() if(minidump_stream.is_open()) { minidump_stream.seekg(0, std::ios::end); - size_t length = minidump_stream.tellg(); + size_t length = (size_t)minidump_stream.tellg(); minidump_stream.seekg(0, std::ios::beg); LLSD::Binary data; |