diff options
author | Rider Linden <rider@lindenlab.com> | 2018-05-22 16:54:04 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-05-22 16:54:04 -0700 |
commit | b29aa01056a1ea08d1d29dd610f6a1cd0aadcd9b (patch) | |
tree | f64a62e6eac9a3d343162a9c52e522761c96e6ca /indra/newview/tests | |
parent | 3888de9439c20eb1698e16fb878a47d78cfdf85e (diff) |
Enable save/load/import for day edit.
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/lldateutil_test.cpp | 2 | ||||
-rw-r--r-- | indra/newview/tests/llworldmap_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp index 47353962e1..e1365aef1c 100644 --- a/indra/newview/tests/lldateutil_test.cpp +++ b/indra/newview/tests/lldateutil_test.cpp @@ -45,7 +45,7 @@ std::map< std::string, std::string > gString; typedef std::pair< std::string, int > count_string_t; std::map< count_string_t, std::string > gCountString; -std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args) +std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool) { std::string text = gString[xml_desc]; LLStringUtil::format(text, args); diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index 84194adb5d..2ca190d459 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 ) { return std::string("test_trans"); } void LLUIString::updateResult() const { } void LLUIString::setArg(const std::string& , const std::string& ) { } void LLUIString::assign(const std::string& ) { } |