summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger/llcrashlogger.cpp
diff options
context:
space:
mode:
authorprep <none@none>2012-03-13 15:48:24 -0400
committerprep <none@none>2012-03-13 15:48:24 -0400
commitfab57eea612f34ed9d8c8559674ead1760aab42b (patch)
tree51394d44e1b89bb75d168464aec539f60f44f8cd /indra/llcrashlogger/llcrashlogger.cpp
parent87b414c4934d0d52eef0b323245568bb1e95ec70 (diff)
parent00717147d2b832fa3239267edf409f0a1dfcd9fd (diff)
pull and merge from viewer-development
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp2
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;