From 1ff40944679b76247bbcbba89ced26fe75c35818 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 14 Aug 2015 19:26:56 -0400 Subject: [PATCH] Hack around opensim having completely broken folder types. (by Drake Arconis) --- indra/newview/llinventorymodel.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 7fb7dd3c5..279c9dc35 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2311,11 +2311,12 @@ void LLInventoryModel::buildParentChildMap() { LLViewerInventoryCategory* cat = cats.at(i); catsp = getUnlockedCatArray(cat->getParentUUID()); - if(catsp && - // Only the two root folders should be children of null. - // Others should go to lost & found. - (cat->getParentUUID().notNull() || - cat->getPreferredType() == LLFolderType::FT_ROOT_INVENTORY )) + if (catsp && + // Only the two root folders should be children of null. + // Others should go to lost & found. + (cat->getParentUUID().notNull() || + (cat->getPreferredType() == LLFolderType::FT_ROOT_INVENTORY + || (cat->getParentUUID().isNull() && cat->getName() == "My Inventory")))) { catsp->push_back(cat); }