summaryrefslogtreecommitdiff
path: root/indra/llkdu/llimagej2ckdu.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
commit484a4733b7b361d87c6092f4f399951e84c2aacd (patch)
tree3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/llkdu/llimagej2ckdu.cpp
parent3dfb4944ed916f9a251078a2614a854b9de0315d (diff)
parent68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff)
Merge latest from lindenlab/viewer-development/
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.cpp')
-rw-r--r--indra/llkdu/llimagej2ckdu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index 39ae09650e..c156ed0cef 100644
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -73,7 +73,7 @@ void set_default_colour_weights(kdu_params *siz);
const char* engineInfoLLImageJ2CKDU()
{
- std::string version = llformat("KDU %s", KDU_CORE_VERSION);
+ static std::string version = llformat("KDU %s", KDU_CORE_VERSION);
return version.c_str();
}