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

EXT-8082 FIXED Fixed viewer crash in outfit list accordion. 

Details:
1 Avoided memory leak of LLAccordionCtrlTab in LLOutfitsList::refreshList method.
2 Provided resetting selection in LLAccordionCtrl::removeCollapsibleCtrl method.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/701/

--HG--
branch : product-engine
master
Alexei Arabadji 2010-07-06 17:00:39 +03:00
parent 6e252a3568
commit a03e123148
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llaccordionctrl.cpp
View File

@ -374,6 +374,12 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view)
break; break;
} }
} }
// if removed is selected - reset selection
if (mSelectedTab == view)
{
mSelectedTab = NULL;
}
} }
void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params) void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)

12
indra/newview/lloutfitslist.cpp
View File

@ -453,6 +453,12 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
{ {
// Remove accordion tab if category could not be added to observer. // Remove accordion tab if category could not be added to observer.
mAccordion->removeCollapsibleCtrl(tab); mAccordion->removeCollapsibleCtrl(tab);
// kill removed tab
if (tab != NULL)
{
tab->die();
}
continue; continue;
} }
@ -523,6 +529,12 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
// 4. Remove outfit tab from accordion. // 4. Remove outfit tab from accordion.
mAccordion->removeCollapsibleCtrl(tab); mAccordion->removeCollapsibleCtrl(tab);
// kill removed tab
if (tab != NULL)
{
tab->die();
}
} }
} }