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

CHUI-147 : Sort the residents names when getting a resident string list

meow-7.2.2
Merov Linden 2012-10-08 18:20:37 -07:00
parent db452823e5
commit 0d619bcdc1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llavataractions.cpp
View File

@ -697,15 +697,15 @@ namespace action_give_inventory
}
// static
void LLAvatarActions::buildResidentsString(const std::vector<LLAvatarName> avatar_names, std::string& residents_string)
void LLAvatarActions::buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string)
{
llassert(avatar_names.size() > 0);
std::sort(avatar_names.begin(), avatar_names.end());
const std::string& separator = LLTrans::getString("words_separator");
for (std::vector<LLAvatarName>::const_iterator it = avatar_names.begin(); ; )
{
LLAvatarName av_name = *it;
residents_string.append(av_name.mDisplayName);
residents_string.append((*it).mDisplayName);
if (++it == avatar_names.end())
{
break;

2
indra/newview/llavataractions.h
View File

@ -216,7 +216,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(const std::vector<LLAvatarName> avatar_names, std::string& residents_string);
static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string);
/**
* Builds a string of residents' display names separated by "words_separator" string.

4
indra/newview/llconversationmodel.cpp
View File

@ -159,7 +159,6 @@ void LLConversationItemSession::updateParticipantName(LLConversationItemParticip
return;
}
// Build a string containing the participants names and check if ready for display (we don't want "(waiting)" in there)
// *TODO: Further factor out common code with LLIMFloater::onParticipantsListChanged()
bool all_names_resolved = true;
uuid_vec_t temp_uuids; // uuids vector for building the added participants' names string
child_list_t::iterator iter = mChildren.begin();
@ -170,6 +169,9 @@ void LLConversationItemSession::updateParticipantName(LLConversationItemParticip
LLAvatarName av_name;
if (!LLAvatarNameCache::get(current_participant->getUUID(), &av_name))
{
// If the name is not in the cache yet, bail out
// Note: we don't bind ourselves to the LLAvatarNameCache event as we are called by
// onAvatarNameCache() which is itself attached to the same event.
all_names_resolved = false;
break;
}