SL-19686 WIP Switching single folder view for large inventories causes stalls

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index bd6f846268..5f30ef3219 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -212,6 +212,14 @@ BOOL LLSidepanelInventory::postBuild()
 
 	gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
 
+    LLFloater *floater = dynamic_cast<LLFloater*>(getParent());
+    if (floater && floater->getKey().isUndefined() && !sLoginCompleted)
+    {
+        // see get_instance_num();
+        // Primary inventory floater will have undefined key
+        initInventoryViews();
+    }
+
 	return TRUE;
 }
 
@@ -425,6 +433,11 @@ void LLSidepanelInventory::showInventoryPanel()
 	mInventoryPanel->setVisible(TRUE);
 }
 
+void LLSidepanelInventory::initInventoryViews()
+{
+    mPanelMainInventory->initInventoryViews();
+}
+
 bool LLSidepanelInventory::canShare()
 {
 	LLInventoryPanel* inbox = mInventoryPanelInbox.get();