diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-31 09:43:23 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-31 09:43:23 -0700 |
| commit | 91f62d1c9cf1d78c6d3b70c8c296d20df873263e (patch) | |
| tree | 3b061b2b18988d3ccdfda8a1121ed1475ae7bfa1 /indra/newview/tests/llslurl_test.cpp | |
| parent | 2ddad24c4d5e64711cdbffd98e290d3da8e9714a (diff) | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
Merge
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(); } |