diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-05-24 02:55:22 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-24 02:55:22 -0700 |
| commit | 809e5563db244a8d1af617b6dcf90f3eebb7f691 (patch) | |
| tree | 9e23fe49bc2939a860162893230f78622e695bdf /indra/newview/tests/llviewernetwork_test.cpp | |
| parent | f277aed2186871ad7fd76de3a49348ed5ba94e3b (diff) | |
| parent | c730ae22f8dc4d31db00244da2fdc44e2e943bd7 (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") |