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

Fix looping over empty age strings on OpenSim, no longer retry on SL

Browse Source
This commit is contained in:
Liru Færs
2020-03-24 15:55:37 -04:00
parent ac1ef4d1ba
commit 55f9937238
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloateravatarlist.cpp
View File

@@ -174,7 +174,8 @@ void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
using namespace boost::gregorian; using namespace boost::gregorian;
int year, month, day; int year, month, day;
const auto born = pAvatarData->born_on; const auto born = pAvatarData->born_on;
if (!born.empty() && sscanf(born.c_str(),"%d/%d/%d",&month,&day,&year) == 3) if (born.empty()) return; // Opensim returns this for NPCs.
if (sscanf(born.c_str(),"%d/%d/%d",&month,&day,&year) == 3)
try try
{ {
mAge = (day_clock::local_day() - date(year, month, day)).days(); mAge = (day_clock::local_day() - date(year, month, day)).days();
@@ -187,10 +188,14 @@ void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
if (!mStats[STAT_TYPE_AGE] && (U32)mAge < sAvatarAgeAlertDays) //Only announce age once per entry. if (!mStats[STAT_TYPE_AGE] && (U32)mAge < sAvatarAgeAlertDays) //Only announce age once per entry.
chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true, (mPosition - gAgent.getPositionGlobal()).magVec()); chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true, (mPosition - gAgent.getPositionGlobal()).magVec());
} }
else // Something failed, resend request else // Something failed, resend request but only on NonSL grids
{ {
LL_WARNS() << "Failed to extract age from APT_PROPERTIES for " << mID << ", received \"" << born << "\". Requesting properties again." << LL_ENDL; LL_WARNS() << "Failed to extract age from APT_PROPERTIES for " << mID << ", received \"" << born << "\"." << LL_ENDL;
inst.sendAvatarPropertiesRequest(mID); if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
{
LL_WARNS() << "Requesting properties again." << LL_ENDL;
inst.sendAvatarPropertiesRequest(mID);
}
} }
} }
} }