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

[Radar] Remove id null checks where null id is an impossibility due to earlier checks

Browse Source
This commit is contained in:
Lirusaito
2013-07-21 02:06:57 -04:00
parent 82c37ca9a3
commit 3650a56407
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloateravatarlist.cpp
View File

@@ -174,17 +174,13 @@ LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name,
mActivityType(ACTIVITY_NEW), mActivityTimer(), mActivityType(ACTIVITY_NEW), mActivityTimer(),
mIsInList(false), mAge(-1), mAgeAlert(false), mTime(time(NULL)) mIsInList(false), mAge(-1), mAgeAlert(false), mTime(time(NULL))
{ {
if (mID.notNull()) LLAvatarPropertiesProcessor::getInstance()->addObserver(mID, this);
{ LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
LLAvatarPropertiesProcessor::getInstance()->addObserver(mID, this);
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
}
} }
LLAvatarListEntry::~LLAvatarListEntry() LLAvatarListEntry::~LLAvatarListEntry()
{ {
if (mID.notNull()) LLAvatarPropertiesProcessor::getInstance()->removeObserver(mID, this);
LLAvatarPropertiesProcessor::getInstance()->removeObserver(mID, this);
} }
// virtual // virtual
@@ -764,12 +760,6 @@ void LLFloaterAvatarList::refreshAvatarList()
continue; continue;
} }
if (av_id.isNull())
{
//llwarns << "Avatar with null key somehow got into the list!" << llendl;
continue;
}
element.value = av_id; element.value = av_id;
LLScrollListCell::Params mark; LLScrollListCell::Params mark;