diff options
| author | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
| commit | 2595d53ded032964623007fa957510d5f1570e29 (patch) | |
| tree | 02b24547a3ca408298b58373f106bb9862fea4be /indra/llkdu/llimagej2ckdu.cpp | |
| parent | fda331bb801918aab3eb5b7026f7e868eca248a2 (diff) | |
| parent | 55a9991812a1f58774fe9b885f588dafcb52d2af (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.cpp')
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 2 |
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(); } |