Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index 30d20bb35a..8c0ea5fd14 100644
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -2070,9 +2070,11 @@ void LLVFS::dumpFiles()
 			std::string extension = get_extension(type);
 			std::string filename = id.asString() + extension;
 			llinfos << " Writing " << filename << llendl;
-			apr_file_t* file = ll_apr_file_open(filename, LL_APR_WB);
-			ll_apr_file_write(file, buffer, size);
-			apr_file_close(file);
+			
+			LLAPRFile outfile ;
+			outfile.open(filename, LL_APR_WB);
+			outfile.write(buffer, size);
+			outfile.close();
 			delete[] buffer;
 			files_extracted++;
 		}