diff options
| -rwxr-xr-x | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bbdfaf655d..bf95989f19 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,6 +226,9 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 + SL-14939 + SL-14940 + SL-14941 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index bc07821ccd..f2e887a678 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -473,9 +473,7 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile() infile.open(filename, LL_APR_RB, NULL, &file_size); if (infile.getFileHandle()) { - LLVFile file(gVFS, getAssetId(), assetType, LLVFile::WRITE); - - file.setMaxSize(file_size); + LLFileSystem file(getAssetId(), assetType, LLFileSystem::APPEND); const S32 buf_size = 65536; U8 copy_buf[buf_size]; |