summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llslurl_test.cpp
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-06-27 17:45:35 +0530
committerAnchor Linden <anchor@lindenlab.com>2018-06-27 17:45:35 +0530
commitb48ca9da4786015f23d265f59f97110b48d0d22f (patch)
treec168dbb2e068bf8bdd96c703b178b783b8e03bfd /indra/newview/tests/llslurl_test.cpp
parenta0beacf007b9e99b7d92647ebb31307d77eec51f (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
Merge
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)