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

SL-19795 Creating folders in combination mode does not scroll to new folder #2

master
Andrey Kleshchev 2023-05-31 01:09:57 +03:00
parent 1834cc1a8b
commit a6efb920e8
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llinventorygallery.cpp
View File

@ -183,7 +183,8 @@ void LLInventoryGallery::setRootFolder(const LLUUID cat_id)
void LLInventoryGallery::updateRootFolder()
{
if (mIsInitialized)
llassert(mFolderID.notNull());
if (mIsInitialized && mFolderID.notNull())
{
S32 count = mItemsAddedCount;
for (S32 i = count - 1; i >= 0; i--)

16
indra/newview/llpanelmaininventory.cpp
View File

@ -1011,9 +1011,12 @@ void LLPanelMainInventory::updateItemcountText()
gInventory.getDirectDescendentsOf(getCurrentSFVRoot(), cats, items);
string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
text = getString("ItemcountCompleted", string_args);
if (items && cats)
{
string_args["[ITEM_COUNT]"] = llformat("%d", items->size());
string_args["[CATEGORY_COUNT]"] = llformat("%d", cats->size());
text = getString("ItemcountCompleted", string_args);
}
}
mCounterCtrl->setValue(text);
@ -1532,6 +1535,13 @@ void LLPanelMainInventory::toggleViewMode()
}
mSingleFolderMode = !mSingleFolderMode;
mCombinationShapeDirty = true;
if (mCombinationGalleryPanel->getRootFolder().isNull())
{
mCombinationGalleryPanel->setRootFolder(mCombinationInventoryPanel->getSingleFolderRoot());
mCombinationGalleryPanel->updateRootFolder();
}
getChild<LLPanel>("default_inventory_panel")->setVisible(!mSingleFolderMode);
getChild<LLPanel>("single_folder_inventory")->setVisible(mSingleFolderMode && isListViewMode());