diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-30 06:39:50 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-30 06:39:50 +0300 |
| commit | 734ce6110f760dfd7cb4ac48224fb804a9e1bbce (patch) | |
| tree | c8f16cd6eeee204145f9837ec172934a5305fcf9 /indra/newview/tests/lldateutil_test.cpp | |
| parent | 64b3473f4920b0340e731e44342e2599ad46d698 (diff) | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
Merged in oz_linden/maint-8675
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); |