livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4974 FIXED Complete name should be used in LLAvatarActions::buildResidentsString only when building name string for share confirmation dialogs

master
Mnikolenko ProductEngine 2015-03-16 18:03:05 +02:00
parent 59a6827847
commit 282ad94175
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llavataractions.cpp
View File

@ -745,7 +745,7 @@ namespace action_give_inventory
}
std::string residents;
LLAvatarActions::buildResidentsString(avatar_names, residents);
LLAvatarActions::buildResidentsString(avatar_names, residents, true);
std::string items;
build_items_string(inventory_selected_uuids, items);
@ -777,7 +777,7 @@ namespace action_give_inventory
}
// static
void LLAvatarActions::buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string)
void LLAvatarActions::buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string, bool complete_name)
{
llassert(avatar_names.size() > 0);
@ -785,7 +785,15 @@ void LLAvatarActions::buildResidentsString(std::vector<LLAvatarName> avatar_name
const std::string& separator = LLTrans::getString("words_separator");
for (std::vector<LLAvatarName>::const_iterator it = avatar_names.begin(); ; )
{
residents_string.append((*it).getCompleteName());
if(complete_name)
{
residents_string.append((*it).getCompleteName());
}
else
{
residents_string.append((*it).getDisplayName());
}
if (++it == avatar_names.end())
{
break;

2
indra/newview/llavataractions.h
View File

@ -221,7 +221,7 @@ public:
* @param avatar_names - a vector of given avatar names from which resulting string is built
* @param residents_string - the resulting string
*/
static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string);
static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string, bool complete_name = false);
/**
* Builds a string of residents' display names separated by "words_separator" string.