diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 4717ec3e398bd7d9676d3268449df6af46f4b5da..fbcaaafce9045f84b5d99f30fc3b71277c5cf3e4 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -1165,6 +1165,10 @@ LLSD LLInventoryCategory::asLLSD() const return sd; } +bool LLInventoryCategory::isPreferredTypeRoot() const +{ + return (mPreferredType == LLFolderType::FT_ROOT_INVENTORY || mPreferredType == 9); +} // virtual void LLInventoryCategory::packMessage(LLMessageSystem* msg) const diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index bbc411f98866558902f2784ca3bb7e52ba4907b5..adb75edd168fad39a5e4a2c5e4cb7ee1962ee730 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -254,6 +254,7 @@ class LLInventoryCategory : public LLInventoryObject void setPreferredType(LLFolderType::EType type); LLSD asLLSD() const; bool fromLLSD(const LLSD& sd); + bool isPreferredTypeRoot() const; //-------------------------------------------------------------------- // Messaging diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index aa3b7a4bc2e5a6426ebbd84ce472fa73e4a7855f..2ec20b827176a3683f8d109ebc7c01ff81917cbc 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2545,7 +2545,7 @@ void LLInventoryModel::buildParentChildMap() // 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->isPreferredTypeRoot())) { catsp->push_back(cat); }