diff options
author | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
commit | d96e672c7fa0cb59ef0c30163326bb40220e745a (patch) | |
tree | 0578f6258788f44f91dbf84eebdb09d994e2a0e5 /linden/indra/newview/llviewermenufile.cpp | |
parent | Fixed login screen only allowing 16 chars per name. (diff) | |
download | meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.zip meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.gz meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.bz2 meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.xz |
Ported many APR changes from Snowglobe.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index 178fc97..3283391 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
@@ -798,7 +798,7 @@ void upload_new_resource(const std::string& src_filename, std::string name, | |||
798 | // copy this file into the vfs for upload | 798 | // copy this file into the vfs for upload |
799 | S32 file_size; | 799 | S32 file_size; |
800 | LLAPRFile infile ; | 800 | LLAPRFile infile ; |
801 | infile.open(filename, LL_APR_RB, NULL, &file_size); | 801 | infile.open(filename, LL_APR_RB, LLAPRFile::local, &file_size); |
802 | if (infile.getFileHandle()) | 802 | if (infile.getFileHandle()) |
803 | { | 803 | { |
804 | LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE); | 804 | LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE); |