diff options
author | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
commit | d96e672c7fa0cb59ef0c30163326bb40220e745a (patch) | |
tree | 0578f6258788f44f91dbf84eebdb09d994e2a0e5 /linden/indra/llimage/llimagej2c.cpp | |
parent | Fixed login screen only allowing 16 chars per name. (diff) | |
download | meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.zip meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.gz meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.bz2 meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.xz |
Ported many APR changes from Snowglobe.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimagej2c.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
420 | 420 | ||
421 | S32 file_size = 0; | 421 | S32 file_size = 0; |
422 | LLAPRFile infile ; | 422 | LLAPRFile infile ; |
423 | infile.open(filename, LL_APR_RB, NULL, &file_size); | 423 | infile.open(filename, LL_APR_RB, LLAPRFile::global, &file_size); |
424 | apr_file_t* apr_file = infile.getFileHandle() ; | 424 | apr_file_t* apr_file = infile.getFileHandle() ; |
425 | if (!apr_file) | 425 | if (!apr_file) |
426 | { | 426 | { |