Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved age alert and title changing blocks out of refreshAvatarList and updateAvatarList to fix them not working as well as they should

Browse Source
This commit is contained in:
Lirusaito
2013-07-19 23:56:20 -04:00
parent ed1dbfaa81
commit 791266fc27
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
indra/newview/llfloateravatarlist.cpp
View File

@@ -586,6 +586,24 @@ void LLFloaterAvatarList::updateAvatarList()
std::string name; std::string name;
const LLUUID &avid = avatar_ids[i]; const LLUUID &avid = avatar_ids[i];
if (avid.isNull())
{
//llinfos << "Key empty for avatar " << name << llendl;
continue;
}
LLAvatarListEntry* entry = getAvatarEntry(avid);
if (entry && !entry->mAgeAlert && entry->mAge >= 0) //Only announce age once per entry.
{
static const LLCachedControl<U32> sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
if ((U32)entry->mAge < sAvatarAgeAlertDays)
{
entry->mAgeAlert = true;
chat_avatar_status(entry->getName().c_str(), avid, ALERT_TYPE_AGE, true);
}
}
LLVector3d position; LLVector3d position;
LLVOAvatar* avatarp = gObjectList.findAvatar(avid); LLVOAvatar* avatarp = gObjectList.findAvatar(avid);
@@ -615,13 +633,6 @@ void LLFloaterAvatarList::updateAvatarList()
} }
} }
if (avid.isNull())
{
//llinfos << "Key empty for avatar " << name << llendl;
continue;
}
LLAvatarListEntry* entry = getAvatarEntry(avid);
if (entry) if (entry)
{ {
// Avatar already in list, update position // Avatar already in list, update position
@@ -654,7 +665,6 @@ void LLFloaterAvatarList::updateAvatarList()
continue; //prevent (Loading...) continue; //prevent (Loading...)
} }
LLAvatarListEntry* entry = getAvatarEntry(avid);
if (entry) if (entry)
{ {
// Avatar already in list, update position // Avatar already in list, update position
@@ -701,6 +711,18 @@ void LLFloaterAvatarList::updateAvatarList()
// llinfos << "radar refresh: done" << llendl; // llinfos << "radar refresh: done" << llendl;
expireAvatarList(); expireAvatarList();
if (mAvatars.empty())
setTitle(getString("Title"));
else if (mAvatars.size() == 1)
setTitle(getString("TitleOneAvatar"));
else
{
LLStringUtil::format_map_t args;
args["[COUNT]"] = boost::lexical_cast<std::string>(mAvatars.size());
setTitle(getString("TitleWithCount", args));
}
refreshAvatarList(); refreshAvatarList();
refreshTracker(); refreshTracker();
} }
@@ -1044,16 +1066,9 @@ void LLFloaterAvatarList::refreshAvatarList()
std::string age = boost::lexical_cast<std::string>(entry->mAge); std::string age = boost::lexical_cast<std::string>(entry->mAge);
if (entry->mAge > -1) if (entry->mAge > -1)
{ {
static LLCachedControl<U32> sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays"); static const LLCachedControl<U32> sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
if ((U32)entry->mAge < sAvatarAgeAlertDays) if ((U32)entry->mAge < sAvatarAgeAlertDays)
{
color = sRadarTextYoung; color = sRadarTextYoung;
if (!entry->mAgeAlert) //Only announce age once per entry.
{
entry->mAgeAlert = true;
chat_avatar_status(entry->getName().c_str(), av_id, ALERT_TYPE_AGE, true);
}
}
} }
else else
{ {
@@ -1121,17 +1136,6 @@ void LLFloaterAvatarList::refreshAvatarList()
mDirtyAvatarSorting = true; mDirtyAvatarSorting = true;
if (mAvatars.empty())
setTitle(getString("Title"));
else if (mAvatars.size() == 1)
setTitle(getString("TitleOneAvatar"));
else
{
LLStringUtil::format_map_t args;
args["[COUNT]"] = boost::lexical_cast<std::string>(mAvatars.size());
setTitle(getString("TitleWithCount", args));
}
// llinfos << "radar refresh: done" << llendl; // llinfos << "radar refresh: done" << llendl;
} }