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

FIRE-20180: More testing: Select last tab when actually opening the appearance floater for the first time

meow-7.2.2
Ansariel 2016-10-17 13:43:55 +02:00
parent fbe1325aaa
commit e762de0bd0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lloutfitslist.cpp
View File

@ -165,8 +165,8 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
tab->setDisplayChildren(false);
// <FS:ND> Calling this when there's a lot of outfits causes horrible perfomance and disconnects, due to arrange eating so many cpu cycles.
mAccordion->addCollapsibleCtrl(tab);
//mAccordion->addCollapsibleCtrl(tab, false);
//mAccordion->addCollapsibleCtrl(tab);
mAccordion->addCollapsibleCtrl(tab, false);
// </FS:ND>
// Start observing the new outfit category.
@ -928,7 +928,7 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
}
// <FS:ND> We called mAccordion->addCollapsibleCtrl with false as second paramter and did not let it arrange itself each time. Do this here after all is said and done.
//arrange();
arrange();
// Handle removed tabs.
for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)

9
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -103,8 +103,9 @@ BOOL LLPanelOutfitsInventory::postBuild()
mSaveComboBtn.reset(new LLSaveOutfitComboBtn(this, true));
if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
mAppearanceTabs->selectFirstTab();
// <FS:Ansariel> FIRE-20180: Select last tab when actually opening the appearance floater for the first time
//if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
// mAppearanceTabs->selectFirstTab();
return TRUE;
}
@ -128,6 +129,10 @@ void LLPanelOutfitsInventory::onOpen(const LLSD& key)
onCOFChanged();
// </FS:Ansariel>
// <FS:Ansariel> FIRE-20180: Select last tab when actually opening the appearance floater for the first time
if (!mAppearanceTabs->selectTab(gSavedSettings.getS32("LastAppearanceTab")))
mAppearanceTabs->selectFirstTab();
mInitialized = true;
}