summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-29 21:18:58 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-29 21:18:58 -0500
commit05fb9468d06e58d4973ec1c3859afa4b3dcad69a (patch)
treec179618e7dd3c9bb334699dc68cd48cc5f4ba028 /indra/llimagej2coj
parenta2067761bbb406e40842ad8ea5275ac4a7dfd44d (diff)
DRTVWR-418: Address yet another effect of downdating openjpeg.
Diffstat (limited to 'indra/llimagej2coj')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 3bb1778d9d..925da5674b 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -41,8 +41,12 @@ LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl()
std::string LLImageJ2COJ::getEngineInfo() const
{
+#ifdef OPENJPEG_VERSION
return std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ")
+ opj_version();
+#else
+ return std::string("OpenJPEG runtime: ") + opj_version();
+#endif
}
// Return string from message, eliminating final \n if present