From 799b5408e413d281b967f62898f1a4956e9a159f Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 21 Jul 2013 04:57:33 -0400 Subject: [PATCH] [Radar] Fix up expireAvatarList to actually expire all the dead avatar entries, not just the back one. --- indra/newview/llfloateravatarlist.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 1d6758273..d5820df38 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -617,15 +617,7 @@ void LLFloaterAvatarList::expireAvatarList() else { entry->setPosition(entry->getPosition(), false, false, false, false); // Dead and gone - if(mAvatars.back() == *it) - { - mAvatars.pop_back(); - return; - } - *it = mAvatars.back(); - mAvatars.pop_back(); - if(mAvatars.empty()) - return; + mAvatars.erase(it); } } }