SL-19796 Fix inventory autoscroll and autoraneme

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2939bc2aaf..6a5b0eebed 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -517,8 +517,13 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
                     mForceShowInvLayout = true;
                 }
 
-                LLFolderBridge* bridge = (LLFolderBridge*)current_folder->getViewModelItem();
-                menu_create_inventory_item(getPanel(), bridge, userdata);
+                std::function<void(const LLUUID&)> callback_cat_created = [this](const LLUUID& new_category_id)
+                {
+                    gInventory.notifyObservers();
+                    mCombinationInventoryPanel->setSelectionByID(new_category_id, TRUE);
+                    mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(TRUE);
+                };
+                menu_create_inventory_item(NULL, getCurrentSFVRoot(), userdata, LLUUID::null, callback_cat_created);
             }
         }
         else