1 files changed, 48 insertions, 20 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index dbf56c2b6d..7910bcb41d 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -139,32 +139,60 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 void LLPanelContents::onFilterEdit()
 {
     const std::string& filter_substring = mFilterEditor->getText();
-    if (filter_substring.empty())
+    if (!mPanelInventoryObject->hasInventory())
     {
-        if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
-        {
-            // The current filter and the new filter are empty, nothing to do
-            return;
-        }
-
-        mSavedFolderState.setApply(true);
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
-
-        // Add a folder with the current item to the list of previously opened folders
-        LLOpenFoldersWithSelection opener;
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(opener);
-        mPanelInventoryObject->getRootFolder()->scrollToShowSelection();
+        mDirtyFilter = true;
     }
-    else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+    else
     {
-        // The first letter in search term, save existing folder open state
-        if (!mPanelInventoryObject->getFilter().isNotDefault())
+        LLFolderView* root_folder = mPanelInventoryObject->getRootFolder();
+        if (filter_substring.empty())
         {
-            mSavedFolderState.setApply(false);
-            mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+            if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+            {
+                // The current filter and the new filter are empty, nothing to do
+                return;
+            }
+
+            if (mDirtyFilter && !mSavedFolderState.hasOpenFolders())
+            {
+                if (root_folder)
+                {
+                    root_folder->setOpenArrangeRecursively(true, LLFolderViewFolder::ERecurseType::RECURSE_DOWN);
+                }
+            }
+            else
+            {
+                mSavedFolderState.setApply(true);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
+            }
+            mDirtyFilter = false;
+
+            // Add a folder with the current item to the list of previously opened folders
+            if (root_folder)
+            {
+                LLOpenFoldersWithSelection opener;
+                root_folder->applyFunctorRecursively(opener);
+                root_folder->scrollToShowSelection();
+            }
+        }
+        else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+        {
+            // The first letter in search term, save existing folder open state
+            if (!mPanelInventoryObject->getFilter().isNotDefault())
+            {
+                mSavedFolderState.setApply(false);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
+                mDirtyFilter = false;
+            }
         }
     }
-
     mPanelInventoryObject->getFilter().setFilterSubString(filter_substring);
 }