diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:07:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:07:29 +0100 |
| commit | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (patch) | |
| tree | ee2b9bc7820211e5a65fe82159cb576409e1e1d2 /indra/newview/tests/lldateutil_test.cpp | |
| parent | c0413250b7e6820b03288bf3bcb035b892870532 (diff) | |
| parent | b0e5bee0b41e050e14d4e315ffa967ba43f96feb (diff) | |
Merge
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); |