summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llslurl_test.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-06-22 11:08:36 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-06-22 11:08:36 +0300
commit21f19cb6f036787d93b186d6fcfd595ae6f03d87 (patch)
treeaa09de906e9c2f9c30670e81498f93620c67d9b8 /indra/newview/tests/llslurl_test.cpp
parentb0e5bee0b41e050e14d4e315ffa967ba43f96feb (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/tests/llslurl_test.cpp')
-rw-r--r--indra/newview/tests/llslurl_test.cpp2
1 files changed, 1 insertions, 1 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)