aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimagej2c.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llimage/llimagej2c.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llimage/llimagej2c.cpp')
-rw-r--r--linden/indra/llimage/llimagej2c.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 9de4d5f..510b303 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -29,8 +29,8 @@
29 */ 29 */
30#include "linden_common.h" 30#include "linden_common.h"
31 31
32#include <apr-1/apr_pools.h> 32#include "apr_pools.h"
33#include <apr-1/apr_dso.h> 33#include "apr_dso.h"
34 34
35#include "lldir.h" 35#include "lldir.h"
36#include "llimagej2c.h" 36#include "llimagej2c.h"
@@ -374,7 +374,7 @@ void LLImageJ2C::setReversible(const BOOL reversible)
374} 374}
375 375
376 376
377BOOL LLImageJ2C::loadAndValidate(const LLString &filename) 377BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
378{ 378{
379 resetLastError(); 379 resetLastError();
380 380