Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hack around opensim having completely broken folder types. (by Drake Arconis)

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-14 19:26:56 -04:00
parent b780878a55
commit 1ff4094467
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llinventorymodel.cpp
View File

@@ -2311,11 +2311,12 @@ void LLInventoryModel::buildParentChildMap()
{ {
LLViewerInventoryCategory* cat = cats.at(i); LLViewerInventoryCategory* cat = cats.at(i);
catsp = getUnlockedCatArray(cat->getParentUUID()); catsp = getUnlockedCatArray(cat->getParentUUID());
if(catsp && if (catsp &&
// Only the two root folders should be children of null. // Only the two root folders should be children of null.
// Others should go to lost & found. // Others should go to lost & found.
(cat->getParentUUID().notNull() || (cat->getParentUUID().notNull() ||
cat->getPreferredType() == LLFolderType::FT_ROOT_INVENTORY )) (cat->getPreferredType() == LLFolderType::FT_ROOT_INVENTORY
|| (cat->getParentUUID().isNull() && cat->getName() == "My Inventory"))))
{ {
catsp->push_back(cat); catsp->push_back(cat);
} }