Ported many APR changes from Snowglobe.

2 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 88edc99..4b0076e 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -1514,7 +1514,7 @@ BOOL LLImageFormatted::load(const std::string &filename)
 
         S32 file_size = 0;
         LLAPRFile infile ;
-        infile.open(filename, LL_APR_RB, NULL, &file_size);
+        infile.open(filename, LL_APR_RB, LLAPRFile::global, &file_size);
         apr_file_t* apr_file = infile.getFileHandle();
         if (!apr_file)
         {
@@ -1550,7 +1550,7 @@ BOOL LLImageFormatted::save(const std::string &filename)
         resetLastError();
 
         LLAPRFile outfile ;
-        outfile.open(filename, LL_APR_WB);
+        outfile.open(filename, LL_APR_WB, LLAPRFile::global);
         if (!outfile.getFileHandle())
         {
                 setLastError("Unable to open file for writing", filename);
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 1b93c21..ed58f85 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -420,7 +420,7 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
 
         S32 file_size = 0;
         LLAPRFile infile ;
-        infile.open(filename, LL_APR_RB, NULL, &file_size);
+        infile.open(filename, LL_APR_RB, LLAPRFile::global, &file_size);
         apr_file_t* apr_file = infile.getFileHandle() ;
         if (!apr_file)
         {