diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-21 13:26:15 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-21 13:26:15 -0400 |
commit | e766d9e697eae29b3f82106603843efbeb7aa01b (patch) | |
tree | 872a0ab94d81699ec3ea1f7113c9c56e2a2486d3 /indra/newview/tests | |
parent | d26c931ae2c5d33adc5fc20842b7be838a2822b4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
DRTVWR-447: Merge up to latest 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) |