diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-02-19 14:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-19 14:06:26 +0200 |
| commit | 8c1f00eebc6863c39d0143aeb7e37c68459d454f (patch) | |
| tree | b3c32a7800e8424d20145d198d548cac550b7956 /indra/newview/llpanelmaininventory.cpp | |
| parent | fd0227c52c1e45fc3ae7abd90a14d7077b1cfdd1 (diff) | |
| parent | 8114850e947f2a76e54912524722c48f22851228 (diff) | |
Merge Forever Fps into 2025.03
Merge Forever Fps into 2025.03
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) { |