Skip to content

Commit 74cdfce

Browse files
committed
#3440 Crash at updateCombinationVisibility
1 parent fa963b6 commit 74cdfce

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

indra/newview/llpanelmaininventory.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,10 +2425,14 @@ void LLPanelMainInventory::updateCombinationVisibility()
24252425

24262426
mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
24272427
mCombinationListLayoutPanel->setVisible(show_inv_pane);
2428-
mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
2429-
if(mCombinationInventoryPanel->hasVisibleItems())
2428+
LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder();
2429+
if (root_folder)
24302430
{
2431-
mForceShowInvLayout = false;
2431+
root_folder->setForceArrange(!show_inv_pane);
2432+
if (mCombinationInventoryPanel->hasVisibleItems())
2433+
{
2434+
mForceShowInvLayout = false;
2435+
}
24322436
}
24332437
if(is_gallery_empty)
24342438
{

0 commit comments

Comments
 (0)