diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
| commit | 2c9a914d7d45b056c845f5b7dba6713ff5c597ae (patch) | |
| tree | f51dc1ff803a43e980c574d556076eed8717e161 /indra/llkdu | |
| parent | 19250ff490eba3ef5e713e10eed4243150691f25 (diff) | |
| parent | d034bdcae74225af23ae29fbe9ba4a78ac7de5a7 (diff) | |
merge changes for storm-1318
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(); } |