diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:50:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:50:14 -0400 |
| commit | e56be73dc646d414c7a10621ac489add6762267b (patch) | |
| tree | 159a4c40b6656f8a5c7383c4ecfcf404013e5a15 /indra/newview/tests/lldateutil_test.cpp | |
| parent | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (diff) | |
| parent | b3822148e1a7664ebc47abbc6eb53c69d27d8b47 (diff) | |
merge changes for 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); |