1 files changed, 19 insertions, 6 deletions

diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 2624ef1207..7910bcb41d 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -145,6 +145,7 @@ void LLPanelContents::onFilterEdit()
     }
     else
     {
+        LLFolderView* root_folder = mPanelInventoryObject->getRootFolder();
         if (filter_substring.empty())
         {
             if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
@@ -155,19 +156,28 @@ void LLPanelContents::onFilterEdit()
 
             if (mDirtyFilter && !mSavedFolderState.hasOpenFolders())
             {
-                mPanelInventoryObject->getRootFolder()->setOpenArrangeRecursively(true, LLFolderViewFolder::ERecurseType::RECURSE_DOWN);
+                if (root_folder)
+                {
+                    root_folder->setOpenArrangeRecursively(true, LLFolderViewFolder::ERecurseType::RECURSE_DOWN);
+                }
             }
             else
             {
                 mSavedFolderState.setApply(true);
-                mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
             }
             mDirtyFilter = false;
 
             // Add a folder with the current item to the list of previously opened folders
-            LLOpenFoldersWithSelection opener;
-            mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(opener);
-            mPanelInventoryObject->getRootFolder()->scrollToShowSelection();
+            if (root_folder)
+            {
+                LLOpenFoldersWithSelection opener;
+                root_folder->applyFunctorRecursively(opener);
+                root_folder->scrollToShowSelection();
+            }
         }
         else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
         {
@@ -175,7 +185,10 @@ void LLPanelContents::onFilterEdit()
             if (!mPanelInventoryObject->getFilter().isNotDefault())
             {
                 mSavedFolderState.setApply(false);
-                mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
                 mDirtyFilter = false;
             }
         }