diff options
| author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
| commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
| tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/llmessage/llhttpclient.cpp | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
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 231cb7ca8f..0c325a68aa 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); |