diff options
author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
commit | 524fbefd2a3b7c6955d5929d7d121ede2386c1df (patch) | |
tree | 1eccde9b330abd27f81bfaebde29e7fa443f132a /indra/newview/tests/llviewernetwork_test.cpp | |
parent | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (diff) | |
parent | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (diff) |
Merge
Diffstat (limited to 'indra/newview/tests/llviewernetwork_test.cpp')
-rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |