diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
| commit | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (patch) | |
| tree | b31e3a1ef86431cda7703621f779b38a98c14a3e /indra/newview/tests/lldateutil_test.cpp | |
| parent | 64302d3000b69b31e72eb6a3bd8a981c80cb88de (diff) | |
| parent | bd84cbfa11fbe2b3aa5ceba5978841310488b8e4 (diff) | |
Merge to 5.1.6
Diffstat (limited to 'indra/newview/tests/lldateutil_test.cpp')
| -rw-r--r-- | indra/newview/tests/lldateutil_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp index 47353962e1..62158d8f66 100644 --- a/indra/newview/tests/lldateutil_test.cpp +++ b/indra/newview/tests/lldateutil_test.cpp @@ -45,7 +45,7 @@ std::map< std::string, std::string > gString; typedef std::pair< std::string, int > count_string_t; std::map< count_string_t, std::string > gCountString; -std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args) +std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string) { std::string text = gString[xml_desc]; LLStringUtil::format(text, args); |