diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-31 09:43:23 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-31 09:43:23 -0700 |
| commit | 91f62d1c9cf1d78c6d3b70c8c296d20df873263e (patch) | |
| tree | 3b061b2b18988d3ccdfda8a1121ed1475ae7bfa1 /indra/newview/tests/llworldmap_test.cpp | |
| parent | 2ddad24c4d5e64711cdbffd98e290d3da8e9714a (diff) | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
Merge
Diffstat (limited to 'indra/newview/tests/llworldmap_test.cpp')
| -rw-r--r-- | indra/newview/tests/llworldmap_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index 2ca190d459..f1dd8acccf 100644 --- a/indra/newview/tests/llworldmap_test.cpp +++ b/indra/newview/tests/llworldmap_test.cpp @@ -66,7 +66,7 @@ void LLWorldMipmap::equalizeBoostLevels() { } LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 grid_y, S32 level, bool load) { return NULL; } // Stub other stuff -std::string LLTrans::getString(const std::string &, const LLStringUtil::format_map_t&, bool ) { return std::string("test_trans"); } +std::string LLTrans::getString(const std::string &, const LLStringUtil::format_map_t&, bool def_string) { return std::string("test_trans"); } void LLUIString::updateResult() const { } void LLUIString::setArg(const std::string& , const std::string& ) { } void LLUIString::assign(const std::string& ) { } |