diff options
| author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
| commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
| tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/llmessage/llhttpclient.cpp | |
| parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
| parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) | |
pull and merge from viewer-development
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); |