diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-14 18:20:55 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-14 18:20:55 -0400 |
| commit | 4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch) | |
| tree | 2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /indra/newview/tests/llslurl_test.cpp | |
| parent | 9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff) | |
| parent | 67f6625c56406604197507c842496f031eb0986f (diff) | |
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'indra/newview/tests/llslurl_test.cpp')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index 4694f657b6..d0f44dcda1 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -46,10 +46,10 @@ static const char * const TEST_FILENAME("llslurl_test.xml"); class LLTrans { public: - static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args); + static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string); }; -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) { return std::string(); } |