diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/llcrashlogger/llcrashlogger.cpp | |
parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) |
Merge pull from vir/drano
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; |