Skip to content
Snippets Groups Projects
Commit c730ae22 authored by Oz Linden's avatar Oz Linden
Browse files

fix tests broken by argument added to LLTrans::getString

parent fe8c976a
No related branches found
No related tags found
No related merge requests found
...@@ -45,7 +45,7 @@ std::map< std::string, std::string > gString; ...@@ -45,7 +45,7 @@ std::map< std::string, std::string > gString;
typedef std::pair< std::string, int > count_string_t; typedef std::pair< std::string, int > count_string_t;
std::map< count_string_t, std::string > gCountString; 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 def_string)
{ {
std::string text = gString[xml_desc]; std::string text = gString[xml_desc];
LLStringUtil::format(text, args); LLStringUtil::format(text, args);
......
...@@ -46,10 +46,10 @@ static const char * const TEST_FILENAME("llslurl_test.xml"); ...@@ -46,10 +46,10 @@ static const char * const TEST_FILENAME("llslurl_test.xml");
class LLTrans class LLTrans
{ {
public: public:
static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args); static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string);
}; };
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 def_string)
{ {
return std::string(); return std::string();
} }
......
...@@ -45,10 +45,10 @@ static const char * const TEST_FILENAME("llviewernetwork_test.xml"); ...@@ -45,10 +45,10 @@ static const char * const TEST_FILENAME("llviewernetwork_test.xml");
class LLTrans class LLTrans
{ {
public: public:
static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args); 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) std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string)
{ {
std::string grid_label = std::string(); std::string grid_label = std::string();
if(xml_desc == "AgniGridLabel") if(xml_desc == "AgniGridLabel")
......
...@@ -66,7 +66,7 @@ void LLWorldMipmap::equalizeBoostLevels() { } ...@@ -66,7 +66,7 @@ void LLWorldMipmap::equalizeBoostLevels() { }
LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 grid_y, S32 level, bool load) { return NULL; } LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 grid_y, S32 level, bool load) { return NULL; }
// Stub other stuff // 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::updateResult() const { }
void LLUIString::setArg(const std::string& , const std::string& ) { } void LLUIString::setArg(const std::string& , const std::string& ) { }
void LLUIString::assign(const std::string& ) { } void LLUIString::assign(const std::string& ) { }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment