From 7ddbf118f5d1fde24c10b93432209fbe44d91345 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 Mar 2021 01:53:45 +0200
Subject: SL-13182 Split buildNewViews over frames

---
 indra/newview/llsidepanelinventory.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llsidepanelinventory.cpp')

diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index ea7e649792..a5dcdc41ed 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -653,7 +653,12 @@ bool LLSidepanelInventory::canWearSelected()
 
 LLInventoryItem *LLSidepanelInventory::getSelectedItem()
 {
-	LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
+    LLFolderView* root = mPanelMainInventory->getActivePanel()->getRootFolder();
+    if (!root)
+    {
+        return NULL;
+    }
+	LLFolderViewItem* current_item = root->getCurSelectedItem();
 	
 	if (!current_item)
 	{
-- 
cgit v1.2.3