diff options
author | Richard Linden <none@none> | 2011-06-02 13:35:15 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-06-02 13:35:15 -0700 |
commit | 960e8c05cb4fbda322d262ee20e85e568089732c (patch) | |
tree | 8b8a2657e41f85c3c3e62752458e467b9761467c /indra/llkdu | |
parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
parent | b530648dd4c5fbf9e566401b4262865047de2e4a (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llkdu')
-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(); } |