From 857a84da3932cccfe0a0964c345b4b51363105c8 Mon Sep 17 00:00:00 2001 From: Lilly Zenovka Date: Mon, 19 Oct 2009 18:24:55 +0200 Subject: Port of objectbackup to 1.23 source tree: fixed LLAPRFile changes Signed-off-by: Jacek Antonelli --- linden/indra/newview/primbackup.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp index 8dbf1df..4e0e56f 100644 --- a/linden/indra/newview/primbackup.cpp +++ b/linden/indra/newview/primbackup.cpp @@ -1070,7 +1070,10 @@ void primbackup::upload_next_asset() uuid = tid.makeAssetID(gAgent.getSecureSessionID()); S32 file_size; - apr_file_t* fp = ll_apr_file_open(filename, LL_APR_RB, &file_size); + apr_file_t* fp; + LLAPRFile aFile; + aFile.open(filename, LL_APR_RB, NULL, &file_size); + fp = aFile.getFileHandle(); if (fp) { const S32 buf_size = 65536; @@ -1078,11 +1081,11 @@ void primbackup::upload_next_asset() LLVFile file(gVFS, uuid, LLAssetType::AT_TEXTURE, LLVFile::WRITE); file.setMaxSize(file_size); - while ((file_size = ll_apr_file_read(fp, copy_buf, buf_size))) + while ((file_size =aFile.read(copy_buf, buf_size))) { file.write(copy_buf, file_size); } - apr_file_close(fp); + aFile.close(); } else { -- cgit v1.1