summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-09 17:19:43 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-09 17:19:43 +0300
commit5e134b4732e5224b1a5da929a4b12ac63ec120b4 (patch)
tree570e1c8cd652469ec38b6079efb3c2c1a5b62bf9 /indra
parent0e7403df70d3298ba39f2269b999dbda574ea117 (diff)
SL-13182 Fix root folder's state
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llfolderview.cpp2
-rw-r--r--indra/newview/llinventorypanel.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 0c1dcc301b..bcca4d78a0 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -257,6 +257,8 @@ LLFolderView::LLFolderView(const Params& p)
mPopupMenuHandle = menu->getHandle();
mViewModelItem->openItem();
+
+ mAreChildrenInited = true; // root folder is a special case due to not being loaded normally, assume that it's inited.
}
// Destroys the object
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 1998fca89d..f181e30d93 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -256,7 +256,6 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
// Determine the root folder in case specified, and
// build the views starting with that folder.
LLFolderView* folder_view = createFolderRoot(root_id);
- folder_view->setChildrenInited(true); // assume that root folder's children are loaded, most of the time we do not load it the normal way
mFolderRoot = folder_view->getHandle();
addItemID(root_id, mFolderRoot.get());
@@ -1103,7 +1102,6 @@ LLFolderViewItem* LLInventoryPanel::buildViewsTree(const LLUUID& id,
if (create_root)
{
folder_view_item->setOpen(TRUE);
- parent_folder->setChildrenInited(true);
}
}
}