summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2007-10-11 19:43:20 +0000
committerBrian McGroarty <soft@lindenlab.com>2007-10-11 19:43:20 +0000
commit788c18c00db8dabdbcdc0ab1af2cf35c24eec8e9 (patch)
tree7958a7cd0bda16382fcbf88a9b2d0bb63148228b /indra/llimagej2coj
parent1b550aaec246063090fe7143145d69eebfbd4680 (diff)
Merge maint-viewer @ r71064
Diffstat (limited to 'indra/llimagej2coj')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index fe53715509..7a323c8354 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -38,6 +38,12 @@
#include "lltimer.h"
#include "llmemory.h"
+const char* fallbackEngineInfoLLImageJ2CImpl()
+{
+ return (std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ")
+ + opj_version()).c_str();
+}
+
LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl()
{
return new LLImageJ2COJ();