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/llmessage/llhttpclient.cpp | |
| parent | 7314ac3a37d624e6a750fc12df64d08b584ad593 (diff) | |
| parent | d32c1c28b4e2add4e51361d13356b6638c6f0817 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llmessage/llhttpclient.cpp')
| -rw-r--r-- | indra/llmessage/llhttpclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index dd4e3a6300..98983ad28a 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -158,7 +158,7 @@ namespace if(fstream.is_open()) { fstream.seekg(0, std::ios::end); - U32 fileSize = fstream.tellg(); + U32 fileSize = (U32)fstream.tellg(); fstream.seekg(0, std::ios::beg); std::vector<char> fileBuffer(fileSize); fstream.read(&fileBuffer[0], fileSize); |