diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-01 16:37:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-01 16:37:59 -0500 |
| commit | 5d78ff48cb1f916180a2ffd10989eae50b81b4ec (patch) | |
| tree | eb1f22ba21082efbb023b1b85468ed7923d519fb /indra/newview/llpanelmaininventory.cpp | |
| parent | 5aa359ed8d4d36e45c562cf56cb69580dc4236b4 (diff) | |
| parent | 42ceac9695f7e098f15264977396a939c8ddfd23 (diff) | |
Merge pull request #3634 from secondlife/release/2024.12-ForeverFPS
Update develop with ForeverFPS
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 377af4384a..a5b4db0580 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2425,10 +2425,14 @@ void LLPanelMainInventory::updateCombinationVisibility() mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty); mCombinationListLayoutPanel->setVisible(show_inv_pane); - mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane); - if(mCombinationInventoryPanel->hasVisibleItems()) + LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder(); + if (root_folder) { - mForceShowInvLayout = false; + root_folder->setForceArrange(!show_inv_pane); + if (mCombinationInventoryPanel->hasVisibleItems()) + { + mForceShowInvLayout = false; + } } if(is_gallery_empty) { |