diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-22 11:08:36 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-22 11:08:36 +0300 |
| commit | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (patch) | |
| tree | aa09de906e9c2f9c30670e81498f93620c67d9b8 /indra/newview/tests | |
| parent | b0e5bee0b41e050e14d4e315ffa967ba43f96feb (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index d0f44dcda1..eabf922875 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -46,7 +46,7 @@ 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, bool def_string); + static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string = false); }; std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string) diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index 2aedb2eb4f..3dd327591e 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -45,7 +45,7 @@ static const char * const TEST_FILENAME("llviewernetwork_test.xml"); class LLTrans { public: - static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string=false); + static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string = false); }; std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string) |