Merge branch 'release/2025.03' into release/2025.04

1 files changed, 14 insertions, 7 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a5b4db0580..d964fa9170 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1582,7 +1582,7 @@ void LLPanelMainInventory::initInventoryViews()
 
 void LLPanelMainInventory::toggleViewMode()
 {
-    if(mSingleFolderMode && isCombinationViewMode())
+    if(mSingleFolderMode && isCombinationViewMode() && mCombinationGalleryPanel->getRootFolder().notNull())
     {
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(false);
     }
@@ -2030,7 +2030,11 @@ void LLPanelMainInventory::onVisibilityChange( bool new_visibility )
         {
             menu->setVisible(false);
         }
-        getActivePanel()->getRootFolder()->finishRenamingItem();
+        LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : nullptr;
+        if (root_folder)
+        {
+            root_folder->finishRenamingItem();
+        }
     }
 }
 
@@ -2043,7 +2047,8 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
     }
     else
     {
-        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+        LLFolderView* root_folder = getActivePanel() ? getActivePanel()->getRootFolder() : nullptr;
+        LLFolderViewItem* current_item = root_folder ? root_folder->getCurSelectedItem() : nullptr;
         if (current_item)
         {
             inv_item = dynamic_cast<LLViewerInventoryItem*>(static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getInventoryObject());
@@ -2439,8 +2444,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
             mCombinationGalleryPanel->handleModifiedFilter();
         }
 
-        getActivePanel()->getRootFolder();
-
         if (mReshapeInvLayout
             && show_inv_pane
             && (mCombinationGalleryPanel->hasVisibleItems() || mCombinationGalleryPanel->areViewsInitialized())
@@ -2497,8 +2500,12 @@ void LLPanelMainInventory::updateCombinationVisibility()
         && mCombinationInventoryPanel->areViewsInitialized())
     {
         mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, true);
-        mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-        mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(true);
+        LLFolderView* root = mCombinationInventoryPanel->getRootFolder();
+        if (root)
+        {
+            root->scrollToShowSelection();
+            root->setNeedsAutoRename(true);
+        }
         mCombInvUUIDNeedsRename.setNull();
     }
 }