diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
| commit | 59ab227c4020565f85e6fc2edf3e3fcc16abb574 (patch) | |
| tree | 94265895fdc0df4d3c38f74288cbd87bc2e01c20 /indra/newview/tests | |
| parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
DRTVWR-528 merge up to 6.4.19
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 57f2d31eab..f9abc8b25d 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -41,6 +41,7 @@ #include "../test/lltut.h" #include "llevents.h" #include "llnotificationsutil.h" +#include "lltrans.h" #if defined(LL_WINDOWS) #pragma warning(disable: 4355) // using 'this' in base-class ctor initializer expr @@ -77,6 +78,11 @@ void LLViewerWindow::setShowProgress(BOOL show) {} LLProgressView * LLViewerWindow::getProgressView(void) const { return 0; } LLViewerWindow* gViewerWindow; + +std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string) +{ + return std::string("test_trans"); +} class LLLogin::Impl { |