diff options
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 2 |
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); } } } |