diff options
| -rw-r--r-- | indra/newview/llinventorygallery.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index c6fee42297..2f9f594790 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -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--) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 39add4ee1c..381506c2a6 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -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()); |