diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-30 06:39:50 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-05-30 06:39:50 +0300 |
| commit | 734ce6110f760dfd7cb4ac48224fb804a9e1bbce (patch) | |
| tree | c8f16cd6eeee204145f9837ec172934a5305fcf9 /indra/newview/tests/llviewernetwork_test.cpp | |
| parent | 64b3473f4920b0340e731e44342e2599ad46d698 (diff) | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
Merged in oz_linden/maint-8675
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") |