From 788c18c00db8dabdbcdc0ab1af2cf35c24eec8e9 Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Thu, 11 Oct 2007 19:43:20 +0000
Subject: Merge maint-viewer @ r71064

---
 indra/llimagej2coj/llimagej2coj.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llimagej2coj')

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();
-- 
cgit v1.2.3