diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 11:58:35 -0500 |
| commit | c0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch) | |
| tree | 28ea7a212319b0bd452c68e54f374904bfe6ed8a /indra/newview/llviewermenufile.cpp | |
| parent | fc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff) | |
| parent | 4331c112aba074562e9a8826fe6d271a94f790f0 (diff) | |
Merge backout of b782a75c99e6
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 8139f7deda..2f9a555903 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -816,7 +816,8 @@ LLUUID upload_new_resource( uuid = tid.makeAssetID(gAgent.getSecureSessionID()); // copy this file into the vfs for upload S32 file_size; - LLAPRFile infile(filename, LL_APR_RB, &file_size); + LLAPRFile infile ; + infile.open(filename, LL_APR_RB, NULL, &file_size); if (infile.getFileHandle()) { LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE); |