diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:07:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:07:29 +0100 |
| commit | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (patch) | |
| tree | ee2b9bc7820211e5a65fe82159cb576409e1e1d2 /indra/newview/tests/llviewernetwork_test.cpp | |
| parent | c0413250b7e6820b03288bf3bcb035b892870532 (diff) | |
| parent | b0e5bee0b41e050e14d4e315ffa967ba43f96feb (diff) | |
Merge
Diffstat (limited to 'indra/newview/tests/llviewernetwork_test.cpp')
| -rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index e68da14fe9..2aedb2eb4f 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -45,10 +45,10 @@ 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); + 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) +std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string) { std::string grid_label = std::string(); if(xml_desc == "AgniGridLabel") |