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/llworldmap_test.cpp | |
| parent | 64b3473f4920b0340e731e44342e2599ad46d698 (diff) | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
Merged in oz_linden/maint-8675
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 84194adb5d..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& ) { 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& ) { } |