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, 7 insertions, 5 deletions

diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 045ca6aa36..747b685b5e 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -236,9 +236,11 @@ BOOL LLFloaterAnimPreview::postBuild()
 
 		// now load bvh file
 		S32 file_size;
-		apr_file_t* fp = ll_apr_file_open(mFilenameAndPath, LL_APR_RB, &file_size);
-
-		if (!fp)
+		
+		LLAPRFile infile ;
+		infile.open(mFilenameAndPath, LL_APR_RB, NULL, &file_size);
+		
+		if (!infile.getFileHandle())
 		{
 			llwarns << "Can't open BVH file:" << mFilename << llendl;	
 		}
@@ -248,14 +250,14 @@ BOOL LLFloaterAnimPreview::postBuild()
 
 			file_buffer = new char[file_size + 1];
 
-			if (file_size == ll_apr_file_read(fp, file_buffer, file_size))
+			if (file_size == infile.read(file_buffer, file_size))
 			{
 				file_buffer[file_size] = '\0';
 				llinfos << "Loading BVH file " << mFilename << llendl;
 				loaderp = new LLBVHLoader(file_buffer);
 			}
 
-			apr_file_close(fp);
+			infile.close() ;
 			delete[] file_buffer;
 		}
 	}