summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagej2c.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
committerDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
commitc0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch)
tree28ea7a212319b0bd452c68e54f374904bfe6ed8a /indra/llimage/llimagej2c.cpp
parentfc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff)
parent4331c112aba074562e9a8826fe6d271a94f790f0 (diff)
Merge backout of b782a75c99e6
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
-rw-r--r--indra/llimage/llimagej2c.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 8c5dc63e9d..c44a66f552 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -370,7 +370,8 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
resetLastError();
S32 file_size = 0;
- LLAPRFile infile(filename, LL_APR_RB, &file_size);
+ LLAPRFile infile ;
+ infile.open(filename, LL_APR_RB, NULL, &file_size);
apr_file_t* apr_file = infile.getFileHandle() ;
if (!apr_file)
{